summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--rebuild2
-rw-r--r--src/tests/basic_deployment.py20
-rw-r--r--src/tox.ini2
3 files changed, 17 insertions, 7 deletions
diff --git a/rebuild b/rebuild
index 1512b42..2b56fde 100644
--- a/rebuild
+++ b/rebuild
@@ -2,4 +2,4 @@
2# when dependencies of the charm change, 2# when dependencies of the charm change,
3# but nothing in the charm needs to. 3# but nothing in the charm needs to.
4# simply change the uuid to something new 4# simply change the uuid to something new
5389bf05a-f851-43e4-b7a1-e2fdf00c2a80 50d1ffbde-e2d6-11e8-aa1a-cb07dc37eb28
diff --git a/src/tests/basic_deployment.py b/src/tests/basic_deployment.py
index 1544283..5758289 100644
--- a/src/tests/basic_deployment.py
+++ b/src/tests/basic_deployment.py
@@ -141,11 +141,21 @@ class DesignateBindDeployment(amulet_deployment.OpenStackAmuletDeployment):
141 self.dns_slave_ip = self.designate_bind_sentry.relation( 141 self.dns_slave_ip = self.designate_bind_sentry.relation(
142 'dns-backend', 142 'dns-backend',
143 'designate:dns-backend')['private-address'] 143 'designate:dns-backend')['private-address']
144 self.designate_svcs = [ 144
145 'designate-agent', 'designate-api', 'designate-central', 145 # bionic_rocky is the "first" rocky version, on Amulet list
146 'designate-mdns', 'designate-pool-manager', 'designate-sink', 146 # that is why start comparing with this version
147 'designate-zone-manager', 147 if self._get_openstack_release() >= self.bionic_rocky:
148 ] 148 self.designate_svcs = [
149 'designate-agent', 'designate-api', 'designate-central',
150 'designate-mdns', 'designate-worker', 'designate-sink',
151 'designate-producer',
152 ]
153 else:
154 self.designate_svcs = [
155 'designate-agent', 'designate-api', 'designate-central',
156 'designate-mdns', 'designate-pool-manager', 'designate-sink',
157 'designate-zone-manager',
158 ]
149 159
150 # Authenticate admin with keystone 160 # Authenticate admin with keystone
151 self.keystone_session, self.keystone = u.get_default_keystone_session( 161 self.keystone_session, self.keystone = u.get_default_keystone_session(
diff --git a/src/tox.ini b/src/tox.ini
index 0e36e84..fc31006 100644
--- a/src/tox.ini
+++ b/src/tox.ini
@@ -35,7 +35,7 @@ commands =
35# Run a specific test as an Amulet smoke test (expected to always pass) 35# Run a specific test as an Amulet smoke test (expected to always pass)
36basepython = python2.7 36basepython = python2.7
37commands = 37commands =
38 bundletester -vl DEBUG -r json -o func-results.json gate-basic-bionic-queens --no-destroy 38 bundletester -vl DEBUG -r json -o func-results.json gate-basic-bionic-rocky --no-destroy
39 39
40[testenv:func27-dfs] 40[testenv:func27-dfs]
41# Run all deploy-from-source tests which are +x (may not always pass!) 41# Run all deploy-from-source tests which are +x (may not always pass!)