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>

diff --git a/tox.ini b/tox.ini
index bc4ba3d6190bde6a777371f4e72fd4498e974d02..61124376a0e1e40386cae064dea0d113e551c915 100644 (file)
--- a/tox.ini
+++ b/tox.ini
@@ -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