Add disco-stein bundle to gate tests

The bundle disco-stein was in the dev bundles because
a bug with the Python 3.7 syntax prevented the success of
the deployment of HA clusters. This bug is fixed, we can
reintegrate disco-stein in the gate bundles.

Other small additions:
- Removed unused Amluet test templates
- removing sitepackages in tox.ini to avoid test env pollution
- skip_missing_interpreters in tox.ini set to False to avoid false
positives by skipping missing interpreters.

LP Related-Bug: #1823718
Change-Id: I38ba1d762fede6c25b8b4c41919859e52eb097fd

tests/README.md

@@ -1,6 +1,6 @@
 # Overview
 
-This directory provides Amulet tests to verify basic deployment functionality
+This directory provides Zaza tests to verify basic deployment functionality
 from the perspective of this charm, its requirements and its features, as
 exercised in a subset of the full OpenStack deployment test bundle topology.
 

tests/dev-basic-disco

@@ -1,8 +0,0 @@
-#!/usr/bin/env python
-
-import basic_deployment
-
-
-if __name__ == "__main__":
-    t = basic_deployment.BasicDeployment(units=3, series='disco')
-    t.run()

tests/gate-basic-bionic

@@ -1,8 +0,0 @@
-#!/usr/bin/env python
-
-import basic_deployment
-
-
-if __name__ == "__main__":
-    t = basic_deployment.BasicDeployment(units=3, series='bionic')
-    t.run()

tests/gate-basic-cosmic

@@ -1,8 +0,0 @@
-#!/usr/bin/env python
-
-import basic_deployment
-
-
-if __name__ == "__main__":
-    t = basic_deployment.BasicDeployment(units=3, series='cosmic')
-    t.run()

tests/gate-basic-xenial

@@ -1,8 +0,0 @@
-#!/usr/bin/env python
-
-import basic_deployment
-
-
-if __name__ == "__main__":
-    t = basic_deployment.BasicDeployment(units=3, series='xenial')
-    t.run()

tests/tests.yaml

@@ -1,5 +1,9 @@
 charm_name: "percona-cluster"
 tests:
+ - disco_model:
+   - zaza.openstack.charm_tests.mysql.tests.PerconaClusterColdStartTest
+   - zaza.openstack.charm_tests.mysql.tests.PerconaClusterCharmTests
+   - zaza.openstack.charm_tests.mysql.tests.PerconaClusterScaleTests
  - bionic_model:
    - zaza.openstack.charm_tests.mysql.tests.PerconaClusterColdStartTest
    - zaza.openstack.charm_tests.mysql.tests.PerconaClusterCharmTests
@@ -13,8 +17,7 @@ target_deploy_status:
 gate_bundles:
   - bionic_model: bionic-ha
   - xenial_model: xenial-ha
-# Disco disabled until hacluster issues are resolved.
-#  - disco-ha
+  - disco_model: disco-ha
 smoke_bundles:
   - bionic_model: bionic-ha
 dev_bundles:

tox.ini

@@ -4,6 +4,10 @@
 [tox]
 envlist = pep8,py37
 skipsdist = True
+# NOTE(beisner): Avoid build/test env pollution by not enabling sitepackages.
+sitepackages = False
+# NOTE(beisner): Avoid false positives by not skipping missing interpreters.
+skip_missing_interpreters = False
 
 [testenv]
 setenv = VIRTUAL_ENV={envdir}