From 19a5362868d61550af4e957aa679f4994b5ff9cb Mon Sep 17 00:00:00 2001 From: Andrew Schoen Date: Wed, 15 Mar 2017 15:08:39 -0500 Subject: [PATCH] tests: adds the ability to set the ceph_stable_release value Use CEPH_STABLE_RELEASE to set the name of the ceph release you plan to install. When testing an upgrade scenario you'll also need to set UPGRADE_CEPH_STABLE_RELEASE. Signed-off-by: Andrew Schoen --- tox.ini | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/tox.ini b/tox.ini index bad1fae04..7118385ce 100644 --- a/tox.ini +++ b/tox.ini @@ -10,10 +10,10 @@ skipsdist = True commands= cp {toxinidir}/infrastructure-playbooks/purge-cluster.yml {toxinidir}/purge-cluster.yml ansible-playbook -vv -i {changedir}/hosts {toxinidir}/purge-cluster.yml \ - --extra-vars="ireallymeanit=yes fetch_directory={changedir}/fetch ceph_rhcs={env:USE_CEPH_RHCS:false} ceph_origin={env:CEPH_ORIGIN:upstream} ceph_dev={env:CEPH_DEV:false} ceph_dev_branch={env:CEPH_DEV_BRANCH:master} ceph_dev_sha1={env:CEPH_DEV_SHA1:latest}" + --extra-vars="ireallymeanit=yes fetch_directory={changedir}/fetch ceph_rhcs={env:USE_CEPH_RHCS:false} ceph_origin={env:CEPH_ORIGIN:upstream} ceph_dev={env:CEPH_DEV:false} ceph_dev_branch={env:CEPH_DEV_BRANCH:master} ceph_dev_sha1={env:CEPH_DEV_SHA1:latest} ceph_stable_release={env:CEPH_STABLE_RELEASE:jewel}" # set up the cluster again ansible-playbook -vv -i {changedir}/hosts {toxinidir}/site.yml.sample \ - --extra-vars="fetch_directory={changedir}/fetch ceph_rhcs={env:USE_CEPH_RHCS:false} ceph_origin={env:CEPH_ORIGIN:upstream} ceph_dev={env:CEPH_DEV:false} ceph_dev_branch={env:CEPH_DEV_BRANCH:master} ceph_dev_sha1={env:CEPH_DEV_SHA1:latest}" + --extra-vars="fetch_directory={changedir}/fetch ceph_rhcs={env:USE_CEPH_RHCS:false} ceph_origin={env:CEPH_ORIGIN:upstream} ceph_dev={env:CEPH_DEV:false} ceph_dev_branch={env:CEPH_DEV_BRANCH:master} ceph_dev_sha1={env:CEPH_DEV_SHA1:latest} ceph_stable_release={env:CEPH_STABLE_RELEASE:jewel}" # test that the cluster can be redeployed in a healthy state testinfra -n 4 --sudo -v --connection=ansible --ansible-inventory={changedir}/hosts {toxinidir}/tests/functional/tests @@ -24,7 +24,7 @@ commands= commands= cp {toxinidir}/infrastructure-playbooks/rolling_update.yml {toxinidir}/rolling_update.yml ansible-playbook -vv -i {changedir}/hosts {toxinidir}/rolling_update.yml \ - --extra-vars="ceph_stable_release=kraken ireallymeanit=yes fetch_directory={changedir}/fetch ceph_rhcs={env:USE_CEPH_RHCS:false} ceph_origin={env:CEPH_ORIGIN:upstream} ceph_dev={env:CEPH_DEV:false} ceph_dev_branch={env:UPDATE_CEPH_DEV_BRANCH:master} ceph_dev_sha1={env:UPDATE_CEPH_DEV_SHA1:latest}" + --extra-vars="ceph_stable_release={env:UPDATE_CEPH_STABLE_RELEASE:kraken} ireallymeanit=yes fetch_directory={changedir}/fetch ceph_rhcs={env:USE_CEPH_RHCS:false} ceph_origin={env:CEPH_ORIGIN:upstream} ceph_dev={env:CEPH_DEV:false} ceph_dev_branch={env:UPDATE_CEPH_DEV_BRANCH:master} ceph_dev_sha1={env:UPDATE_CEPH_DEV_SHA1:latest}" testinfra -n 4 --sudo -v --connection=ansible --ansible-inventory={changedir}/hosts {toxinidir}/tests/functional/tests @@ -72,7 +72,7 @@ commands= bash {toxinidir}/tests/scripts/generate_ssh_config.sh {changedir} ansible-playbook -vv -i {changedir}/hosts {toxinidir}/{env:PLAYBOOK:site.yml.sample} \ - --extra-vars="fetch_directory={changedir}/fetch ceph_rhcs={env:USE_CEPH_RHCS:false} ceph_origin={env:CEPH_ORIGIN:upstream} ceph_dev={env:CEPH_DEV:false} ceph_dev_branch={env:CEPH_DEV_BRANCH:master} ceph_dev_sha1={env:CEPH_DEV_SHA1:latest}" + --extra-vars="fetch_directory={changedir}/fetch ceph_rhcs={env:USE_CEPH_RHCS:false} ceph_origin={env:CEPH_ORIGIN:upstream} ceph_dev={env:CEPH_DEV:false} ceph_dev_branch={env:CEPH_DEV_BRANCH:master} ceph_dev_sha1={env:CEPH_DEV_SHA1:latest} ceph_stable_release={env:CEPH_STABLE_RELEASE:jewel}" ansible-playbook -vv -i {changedir}/hosts {toxinidir}/tests/functional/setup.yml testinfra -n 4 --sudo -v --connection=ansible --ansible-inventory={changedir}/hosts {toxinidir}/tests/functional/tests -- 2.39.5