tests: use CEPH_STABLE to set the value for ceph_stable

When using CEPH_DEV=true you'll need to set CEPH_STABLE=false so that
that an upstream repo file doesn't get created.

Signed-off-by: Andrew Schoen <aschoen@redhat.com>
pull/1368/head
Andrew Schoen 2017-03-15 16:10:08 -05:00
parent b1f5798607
commit e3c8f7db4e
1 changed files with 12 additions and 4 deletions

16
tox.ini
View File

@ -17,7 +17,9 @@ commands=
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}"
ceph_stable_release={env:CEPH_STABLE_RELEASE:jewel} \
ceph_stable={env:CEPH_STABLE:true} \
"
# set up the cluster again
ansible-playbook -vv -i {changedir}/hosts {toxinidir}/site.yml.sample --extra-vars="\
fetch_directory={changedir}/fetch \
@ -26,7 +28,9 @@ commands=
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}"
ceph_stable_release={env:CEPH_STABLE_RELEASE:jewel} \
ceph_stable={env:CEPH_STABLE:true} \
"
# 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
@ -44,7 +48,9 @@ commands=
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}"
ceph_dev_sha1={env:UPDATE_CEPH_DEV_SHA1:latest} \
ceph_stable={env:CEPH_STABLE:true} \
"
testinfra -n 4 --sudo -v --connection=ansible --ansible-inventory={changedir}/hosts {toxinidir}/tests/functional/tests
@ -98,7 +104,9 @@ commands=
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}"
ceph_stable_release={env:CEPH_STABLE_RELEASE:jewel} \
ceph_stable={env:CEPH_STABLE:true} \
"
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