From 289de48a172f299211d3558e339189ebca958050 Mon Sep 17 00:00:00 2001 From: Liam Young Date: Thu, 22 Feb 2018 11:15:56 +0000 Subject: [PATCH] Enable Queens amulet tests and fix domain name Enable the xenial queens tests at gate and fix the domain name check to expect the service domain for quuens and above. Change-Id: I610f390d1c113b4f3312e243b53aa0e7114123bc --- tests/basic_deployment.py | 10 ++++++++-- ...ev-basic-xenial-queens => gate-basic-xenial-queens} | 0 2 files changed, 8 insertions(+), 2 deletions(-) rename tests/{dev-basic-xenial-queens => gate-basic-xenial-queens} (100%) diff --git a/tests/basic_deployment.py b/tests/basic_deployment.py index a80821cf..2ad59573 100644 --- a/tests/basic_deployment.py +++ b/tests/basic_deployment.py @@ -42,8 +42,8 @@ class NeutronAPIBasicDeployment(OpenStackAmuletDeployment): self._deploy() u.log.info('Waiting on extended status checks...') - exclude_services = [] - self._auto_wait_for_status(exclude_services=exclude_services) + self.exclude_services = [] + self._auto_wait_for_status(exclude_services=self.exclude_services) self.d.sentry.wait() self._initialize_tests() @@ -534,6 +534,11 @@ class NeutronAPIBasicDeployment(OpenStackAmuletDeployment): 'rabbit_host': rabbitmq_relation['hostname'] }) + if self._get_openstack_release() >= self.xenial_queens: + domain = 'service_domain' + expected['keystone_authtoken']['project_domain_name'] = domain + expected['keystone_authtoken']['user_domain_name'] = domain + for section, pairs in expected.iteritems(): ret = u.validate_config_data(unit, conf, section, pairs) if ret: @@ -658,6 +663,7 @@ class NeutronAPIBasicDeployment(OpenStackAmuletDeployment): u.log.debug('Making config change on {}...'.format(juju_service)) mtime = u.get_sentry_time(sentry) self.d.configure(juju_service, set_alternate) + self._auto_wait_for_status(exclude_services=self.exclude_services) for s, conf_file in services.iteritems(): u.log.debug("Checking that service restarted: {}".format(s)) diff --git a/tests/dev-basic-xenial-queens b/tests/gate-basic-xenial-queens similarity index 100% rename from tests/dev-basic-xenial-queens rename to tests/gate-basic-xenial-queens