Merge "Add disco-stein bundle to gate tests"

tests/bundles/disco-stein.yaml

@@ -0,0 +1,23 @@
+series: disco
+applications:
+  ceph-mon:
+    charm: 'cs:~openstack-charmers-next/ceph-mon'
+    num_units: 3
+    options:
+      expected-osd-count: 3
+  ceph-osd:
+    charm: 'cs:~openstack-charmers-next/ceph-osd'
+    num_units: 3
+    storage:
+      osd-devices: 10G
+  ceph-proxy:
+    charm: 'ceph-proxy'
+    num_units: 1
+  ceph-radosgw:
+    charm: 'cs:~openstack-charmers-next/ceph-radosgw'
+    num_units: 1
+relations:
+  - - 'ceph-osd:mon'
+    - 'ceph-mon:osd'
+  - - 'ceph-proxy:radosgw'
+    - 'ceph-radosgw:mon'

tests/tests.yaml

@@ -10,6 +10,8 @@ gate_bundles:
   - xenial-queens # luminous
   - bionic-queens # luminous
   - bionic-rocky  # mimic
+  - bionic-stein
+  - disco-stein
 dev_bundles:
   # Icehouse
   - trusty-icehouse
@@ -22,9 +24,6 @@ dev_bundles:
   - xenial-ocata
   # Pike
   - xenial-pike
-  # Mimic
-  - bionic-stein
-
 smoke_bundles:
   - bionic-stein
 

tox.ini

@@ -4,17 +4,20 @@
 [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}
          PYTHONHASHSEED=0
          CHARM_DIR={envdir}
-         AMULET_SETUP_TIMEOUT=5400
 install_command =
   pip install {opts} {packages}
 commands = stestr run {posargs}
 whitelist_externals = juju
-passenv = HOME TERM AMULET_* CS_API_*
+passenv = HOME TERM OS_* CS_API_*
 deps = -r{toxinidir}/requirements.txt
        -r{toxinidir}/test-requirements.txt