From e320c3a7cce05ba3f66653205f9e2cda396ad0fa Mon Sep 17 00:00:00 2001 From: Ryan Beisner Date: Wed, 7 Nov 2018 15:41:18 -0600 Subject: [PATCH] Rebuild for sync charm-helpers Change-Id: I563f81e62bc3d17814901ab8cd56f260aeb1ac8b --- rebuild | 2 +- src/tests/basic_deployment.py | 2 -- src/tests/gate-basic-bionic-queens | 10 ---------- src/tests/gate-basic-xenial-mitaka | 10 ---------- src/tests/gate-basic-xenial-mitaka-ksv2 | 10 ---------- src/tests/gate-basic-xenial-ocata | 12 ------------ src/tests/gate-basic-xenial-pike | 12 ------------ src/tests/gate-basic-xenial-queens | 12 ------------ src/tox.ini | 2 +- 9 files changed, 2 insertions(+), 70 deletions(-) delete mode 100755 src/tests/gate-basic-bionic-queens delete mode 100755 src/tests/gate-basic-xenial-mitaka delete mode 100755 src/tests/gate-basic-xenial-mitaka-ksv2 delete mode 100755 src/tests/gate-basic-xenial-ocata delete mode 100755 src/tests/gate-basic-xenial-pike delete mode 100755 src/tests/gate-basic-xenial-queens diff --git a/rebuild b/rebuild index 08ac52e..f7c0013 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 -93e11b9e-86a6-11e8-b3ac-9f8b2e5df0b9 +d579a360-e2d5-11e8-bdce-bbbefa373720 diff --git a/src/tests/basic_deployment.py b/src/tests/basic_deployment.py index 31ca2a7..504c23f 100644 --- a/src/tests/basic_deployment.py +++ b/src/tests/basic_deployment.py @@ -86,8 +86,6 @@ class SoftHSMBasicDeployment(OpenStackAmuletDeployment): # say we don't need an HSM for these tests barbican_config = { 'require-hsm-plugin': True, - 'verbose': True, - 'keystone-api-version': str(keystone_version), } pxc_config = { 'dataset-size': '25%', diff --git a/src/tests/gate-basic-bionic-queens b/src/tests/gate-basic-bionic-queens deleted file mode 100755 index c48ccc4..0000000 --- a/src/tests/gate-basic-bionic-queens +++ /dev/null @@ -1,10 +0,0 @@ -#!/usr/bin/env python - -"""Amulet tests on a basic aodh deployment on bionic-queens for keystone v3. -""" - -from basic_deployment import SoftHSMBasicDeployment - -if __name__ == '__main__': - deployment = SoftHSMBasicDeployment(series='bionic', keystone_version=3) - deployment.run_tests() diff --git a/src/tests/gate-basic-xenial-mitaka b/src/tests/gate-basic-xenial-mitaka deleted file mode 100755 index 1429dfa..0000000 --- a/src/tests/gate-basic-xenial-mitaka +++ /dev/null @@ -1,10 +0,0 @@ -#!/usr/bin/env python - -"""Amulet tests on a basic aodh deployment on xenial-mitaka for keystone v3. -""" - -from basic_deployment import SoftHSMBasicDeployment - -if __name__ == '__main__': - deployment = SoftHSMBasicDeployment(series='xenial', keystone_version=3) - deployment.run_tests() diff --git a/src/tests/gate-basic-xenial-mitaka-ksv2 b/src/tests/gate-basic-xenial-mitaka-ksv2 deleted file mode 100755 index 77e3a54..0000000 --- a/src/tests/gate-basic-xenial-mitaka-ksv2 +++ /dev/null @@ -1,10 +0,0 @@ -#!/usr/bin/env python - -"""Amulet tests on a basic aodh deployment on xenial-mitaka for keystone v2. -""" - -from basic_deployment import SoftHSMBasicDeployment - -if __name__ == '__main__': - deployment = SoftHSMBasicDeployment(series='xenial', keystone_version=2) - deployment.run_tests() diff --git a/src/tests/gate-basic-xenial-ocata b/src/tests/gate-basic-xenial-ocata deleted file mode 100755 index 2a13004..0000000 --- a/src/tests/gate-basic-xenial-ocata +++ /dev/null @@ -1,12 +0,0 @@ -#!/usr/bin/env python - -"""Amulet tests on a basic barbican deploy on xenial-ocata for keystone v3. -""" - -from basic_deployment import SoftHSMBasicDeployment - -if __name__ == '__main__': - deployment = SoftHSMBasicDeployment(series='xenial', keystone_version=3, - openstack='cloud:xenial-ocata', - source='cloud:xenial-updates/ocata') - deployment.run_tests() diff --git a/src/tests/gate-basic-xenial-pike b/src/tests/gate-basic-xenial-pike deleted file mode 100755 index 0e82e41..0000000 --- a/src/tests/gate-basic-xenial-pike +++ /dev/null @@ -1,12 +0,0 @@ -#!/usr/bin/env python - -"""Amulet tests on a basic barbican deploy on xenial-pike for keystone v3. -""" - -from basic_deployment import SoftHSMBasicDeployment - -if __name__ == '__main__': - deployment = SoftHSMBasicDeployment(series='xenial', keystone_version=3, - openstack='cloud:xenial-pike', - source='cloud:xenial-updates/pike') - deployment.run_tests() diff --git a/src/tests/gate-basic-xenial-queens b/src/tests/gate-basic-xenial-queens deleted file mode 100755 index ada996f..0000000 --- a/src/tests/gate-basic-xenial-queens +++ /dev/null @@ -1,12 +0,0 @@ -#!/usr/bin/env python - -"""Amulet tests on a basic barbican deploy on xenial-queens for keystone v3. -""" - -from basic_deployment import SoftHSMBasicDeployment - -if __name__ == '__main__': - deployment = SoftHSMBasicDeployment(series='xenial', keystone_version=3, - openstack='cloud:xenial-queens', - source='cloud:xenial-updates/queens') - deployment.run_tests() 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!)