From 4266ad567b210df7cea21c5c47686efc2e1f41d3 Mon Sep 17 00:00:00 2001 From: Alex Kavanagh Date: Mon, 11 May 2020 13:01:25 +0100 Subject: [PATCH] Rebuild for sync charm-helpers for 20.05 release Due to the ha change in charm-manila [0] xenial-mitaka and xenial-ocata are no longer supported by manila. Hence remove them from the gate. [0]: I1f501283db3db1338d47a89a7688cf5035d08a7a Change-Id: Ifcd489d1c58abba7776dcd1c2b56777e552539a2 --- rebuild | 2 +- ...{gate-basic-xenial-mitaka => dev-basic-xenial-mitaka} | 0 .../{gate-basic-xenial-ocata => dev-basic-xenial-ocata} | 5 ++++- src/tests/gate-basic-bionic-queens | 5 +++-- src/tests/gate-basic-bionic-rocky | 7 +++++-- src/tests/gate-basic-bionic-stein | 7 +++++-- src/tests/gate-basic-bionic-train | 9 +++++---- src/tests/gate-basic-xenial-pike | 5 ++++- src/tests/gate-basic-xenial-queens | 7 +++++-- 9 files changed, 32 insertions(+), 15 deletions(-) rename src/tests/{gate-basic-xenial-mitaka => dev-basic-xenial-mitaka} (100%) rename src/tests/{gate-basic-xenial-ocata => dev-basic-xenial-ocata} (56%) diff --git a/rebuild b/rebuild index d9293a5..315feac 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 -d1c16faa-4837-11ea-810e-97e1f362d969 +c17ec0ce-937e-11ea-a49b-8b4b0c8e2b7f diff --git a/src/tests/gate-basic-xenial-mitaka b/src/tests/dev-basic-xenial-mitaka similarity index 100% rename from src/tests/gate-basic-xenial-mitaka rename to src/tests/dev-basic-xenial-mitaka diff --git a/src/tests/gate-basic-xenial-ocata b/src/tests/dev-basic-xenial-ocata similarity index 56% rename from src/tests/gate-basic-xenial-ocata rename to src/tests/dev-basic-xenial-ocata index 59fd7c5..04208d6 100755 --- a/src/tests/gate-basic-xenial-ocata +++ b/src/tests/dev-basic-xenial-ocata @@ -6,5 +6,8 @@ from basic_deployment import ManilaGenericBasicDeployment if __name__ == '__main__': - deployment = ManilaGenericBasicDeployment(series='xenial', keystone_version='2') + deployment = ManilaGenericBasicDeployment( + series='xenial', keystone_version='2', + openstack='cloud:xenial-mitaka', + source='cloud:xenial-mitaka') deployment.run_tests() diff --git a/src/tests/gate-basic-bionic-queens b/src/tests/gate-basic-bionic-queens index 01c6e8d..97e2754 100755 --- a/src/tests/gate-basic-bionic-queens +++ b/src/tests/gate-basic-bionic-queens @@ -1,10 +1,11 @@ #!/usr/bin/env python -"""Amulet tests on a basic barbican deployment on bionic-queens for keystone v2. +"""Amulet tests on a basic barbican deployment on bionic-queens for keystone v2 """ from basic_deployment import ManilaGenericBasicDeployment if __name__ == '__main__': - deployment = ManilaGenericBasicDeployment(series='bionic', keystone_version='3') + deployment = ManilaGenericBasicDeployment( + series='bionic', keystone_version='3') deployment.run_tests() diff --git a/src/tests/gate-basic-bionic-rocky b/src/tests/gate-basic-bionic-rocky index 78fab13..c3108b2 100755 --- a/src/tests/gate-basic-bionic-rocky +++ b/src/tests/gate-basic-bionic-rocky @@ -1,10 +1,13 @@ #!/usr/bin/env python -"""Amulet tests on a basic barbican deployment on bionic-rocky for keystone v2. +"""Amulet tests on a basic barbican deployment on bionic-rocky for keystone v3 """ from basic_deployment import ManilaGenericBasicDeployment if __name__ == '__main__': - deployment = ManilaGenericBasicDeployment(series='bionic', keystone_version='3') + deployment = ManilaGenericBasicDeployment( + series='bionic', keystone_version='3', + openstack='cloud:bionic-rocky', + source='cloud:bionic-rocky') deployment.run_tests() diff --git a/src/tests/gate-basic-bionic-stein b/src/tests/gate-basic-bionic-stein index fe8cc49..c69df3c 100755 --- a/src/tests/gate-basic-bionic-stein +++ b/src/tests/gate-basic-bionic-stein @@ -1,10 +1,13 @@ #!/usr/bin/env python -"""Amulet tests on a basic barbican deployment on bionic-stein for keystone v2. +"""Amulet tests on a basic barbican deployment on bionic-stein for keystone v3 """ from basic_deployment import ManilaGenericBasicDeployment if __name__ == '__main__': - deployment = ManilaGenericBasicDeployment(series='bionic', keystone_version='3') + deployment = ManilaGenericBasicDeployment( + series='bionic', keystone_version='3', + openstack='cloud:bionic-stein', + source='cloud:bionic-train') deployment.run_tests() diff --git a/src/tests/gate-basic-bionic-train b/src/tests/gate-basic-bionic-train index 31332e5..8d83cc1 100755 --- a/src/tests/gate-basic-bionic-train +++ b/src/tests/gate-basic-bionic-train @@ -1,12 +1,13 @@ #!/usr/bin/env python -"""Amulet tests on a basic barbican deployment on bionic-train for keystone v2. +"""Amulet tests on a basic barbican deployment on bionic-train for keystone v3 """ from basic_deployment import ManilaGenericBasicDeployment if __name__ == '__main__': - deployment = ManilaGenericBasicDeployment(series='bionic', keystone_version='3', - openstack='cloud:bionic-train', - source='cloud:bionic-train') + deployment = ManilaGenericBasicDeployment( + series='bionic', keystone_version='3', + openstack='cloud:bionic-train', + source='cloud:bionic-train') deployment.run_tests() diff --git a/src/tests/gate-basic-xenial-pike b/src/tests/gate-basic-xenial-pike index 233b402..ada1915 100755 --- a/src/tests/gate-basic-xenial-pike +++ b/src/tests/gate-basic-xenial-pike @@ -6,5 +6,8 @@ from basic_deployment import ManilaGenericBasicDeployment if __name__ == '__main__': - deployment = ManilaGenericBasicDeployment(series='xenial', keystone_version='2') + deployment = ManilaGenericBasicDeployment( + series='xenial', keystone_version='2', + openstack='cloud:xenial-pike', + source='cloud:xenial-pike') deployment.run_tests() diff --git a/src/tests/gate-basic-xenial-queens b/src/tests/gate-basic-xenial-queens index 49ec6ec..89482ae 100755 --- a/src/tests/gate-basic-xenial-queens +++ b/src/tests/gate-basic-xenial-queens @@ -1,10 +1,13 @@ #!/usr/bin/env python -"""Amulet tests on a basic barbican deployment on xenial-queens for keystone v2. +"""Amulet tests on a basic barbican deployment on xenial-queens for keystone v3 """ from basic_deployment import ManilaGenericBasicDeployment if __name__ == '__main__': - deployment = ManilaGenericBasicDeployment(series='xenial', keystone_version='2') + deployment = ManilaGenericBasicDeployment( + series='xenial', keystone_version='3', + openstack='cloud:xenial-queens', + source='cloud:xenial-queens') deployment.run_tests()