From b38c270036a3e3efeb4d18c288786439fd2301b1 Mon Sep 17 00:00:00 2001 From: Aurelien Lourot Date: Wed, 2 Sep 2020 11:51:04 +0200 Subject: [PATCH 1/2] Adapt list of swift services on focal-victoria --- zaza/openstack/charm_tests/swift/tests.py | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/zaza/openstack/charm_tests/swift/tests.py b/zaza/openstack/charm_tests/swift/tests.py index 75f82b7..fa73c16 100644 --- a/zaza/openstack/charm_tests/swift/tests.py +++ b/zaza/openstack/charm_tests/swift/tests.py @@ -114,6 +114,17 @@ class SwiftStorageTests(test_utils.OpenStackBaseTest): 'swift-object-replicator', 'swift-object-updater', 'swift-container-sync'] + + focal_victoria = openstack_utils.get_os_release('focal_victoria') + if self.current_os_release < focal_victoria: + services += ['swift-account-replicator', + 'swift-container-replicator', + 'swift-object-replicator'] + else: + services += ['swift-account-server', + 'swift-container-server', + 'swift-object-server'] + with self.pause_resume(services): logging.info("Testing pause resume") From 23c3dde105b481ef34749132f993d4452c56e53a Mon Sep 17 00:00:00 2001 From: Aurelien Lourot Date: Wed, 2 Sep 2020 13:40:08 +0200 Subject: [PATCH 2/2] Fix SwiftStorageTests.test_901_pause_resume --- zaza/openstack/charm_tests/swift/tests.py | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/zaza/openstack/charm_tests/swift/tests.py b/zaza/openstack/charm_tests/swift/tests.py index fa73c16..62fe02c 100644 --- a/zaza/openstack/charm_tests/swift/tests.py +++ b/zaza/openstack/charm_tests/swift/tests.py @@ -104,19 +104,17 @@ class SwiftStorageTests(test_utils.OpenStackBaseTest): services = ['swift-account-server', 'swift-account-auditor', 'swift-account-reaper', - 'swift-account-replicator', 'swift-container-server', 'swift-container-auditor', - 'swift-container-replicator', 'swift-container-updater', 'swift-object-server', 'swift-object-auditor', - 'swift-object-replicator', 'swift-object-updater', 'swift-container-sync'] + current_os_release = openstack_utils.get_os_release() focal_victoria = openstack_utils.get_os_release('focal_victoria') - if self.current_os_release < focal_victoria: + if current_os_release < focal_victoria: services += ['swift-account-replicator', 'swift-container-replicator', 'swift-object-replicator']