From b599190d9bf9810660d623bf2ea2bdc425760ec0 Mon Sep 17 00:00:00 2001 From: Ryan Beisner Date: Wed, 7 Nov 2018 15:42:51 -0600 Subject: [PATCH] Rebuild for sync charm-helpers Change-Id: Ic0725c33d0929418bd00e3f93798e46fc1ba2cd3 --- rebuild | 2 +- src/tests/basic_deployment.py | 20 +++++++++++++++----- src/tox.ini | 2 +- 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 @@ # when dependencies of the charm change, # but nothing in the charm needs to. # simply change the uuid to something new -389bf05a-f851-43e4-b7a1-e2fdf00c2a80 +0d1ffbde-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): self.dns_slave_ip = self.designate_bind_sentry.relation( 'dns-backend', 'designate:dns-backend')['private-address'] - self.designate_svcs = [ - 'designate-agent', 'designate-api', 'designate-central', - 'designate-mdns', 'designate-pool-manager', 'designate-sink', - 'designate-zone-manager', - ] + + # bionic_rocky is the "first" rocky version, on Amulet list + # that is why start comparing with this version + if self._get_openstack_release() >= self.bionic_rocky: + self.designate_svcs = [ + 'designate-agent', 'designate-api', 'designate-central', + 'designate-mdns', 'designate-worker', 'designate-sink', + 'designate-producer', + ] + else: + self.designate_svcs = [ + 'designate-agent', 'designate-api', 'designate-central', + 'designate-mdns', 'designate-pool-manager', 'designate-sink', + 'designate-zone-manager', + ] # Authenticate admin with keystone 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 = # Run a specific test as an Amulet smoke test (expected to always pass) basepython = python2.7 commands = - bundletester -vl DEBUG -r json -o func-results.json gate-basic-bionic-queens --no-destroy + bundletester -vl DEBUG -r json -o func-results.json gate-basic-bionic-rocky --no-destroy [testenv:func27-dfs] # Run all deploy-from-source tests which are +x (may not always pass!)