tests: cleanup tox definition

remove useless environment variable definition since we know we only
test ceph@master on ceph-ansible master branch.

Signed-off-by: Guillaume Abrioux <gabrioux@redhat.com>

diff --git a/tox.ini b/tox.ini
index 533b3ae9f92bd33bf2671add6fe3d5ba0abb0f1f..b5b01a5a4bbbec43957675d82f89eeee5b2851eb 100644 (file)
--- a/tox.ini
+++ b/tox.ini
@@ -106,7 +106,7 @@ commands=
   cp {toxinidir}/infrastructure-playbooks/rolling_update.yml {toxinidir}/rolling_update.yml
   ansible-playbook -vv -i {changedir}/hosts {toxinidir}/rolling_update.yml --extra-vars "\
       ireallymeanit=yes \
-      ceph_stable_release={env:UPDATE_CEPH_STABLE_RELEASE:kraken} \
+      ceph_stable_release={env:UPDATE_CEPH_STABLE_RELEASE:nautilus} \
       fetch_directory={env:FETCH_DIRECTORY:{changedir}/fetch} \
       ceph_docker_registry={env:CEPH_DOCKER_REGISTRY:docker.io} \
       ceph_docker_image={env:UPDATE_CEPH_DOCKER_IMAGE:ceph/daemon} \
@@ -219,8 +219,6 @@ setenv=
   update_docker_cluster: PLAYBOOK = site-docker.yml.sample
   purge_cluster_container: PLAYBOOK = site-docker.yml.sample
   purge_cluster_container: PURGE_PLAYBOOK = purge-docker-cluster.yml
-  purge_lvm_osds_container: PLAYBOOK = site-docker.yml.sample
-  purge_lvm_osds_container: PURGE_PLAYBOOK = purge-docker-cluster.yml
   add_osds: PLAYBOOK = site.yml.sample
   add_osds_container: PLAYBOOK = site-docker.yml.sample
   rgw_multisite: PLAYBOOK = site.yml.sample
@@ -247,19 +245,26 @@ setenv=
   mimic: UPDATE_CEPH_DOCKER_IMAGE_TAG = latest
   lvm_osds: CEPH_STABLE_RELEASE = luminous
   lvm_osds: PLAYBOOK = site.yml.sample
-  lvm_osds_container: CEPH_STABLE_RELEASE = luminous
   lvm_osds_container: PLAYBOOK = site-docker.yml.sample
-  bluestore_lvm_osds: CEPH_STABLE_RELEASE = luminous
-  bluestore_lvm_osds_container: CEPH_STABLE_RELEASE = luminous
   bluestore_lvm_osds_container: PLAYBOOK = site-docker.yml.sample
   lvm_batch_container: PLAYBOOK = site-docker.yml.sample
-  lvm_batch_container: CEPH_STABLE_RELEASE = luminous
+  shrink_osd_container: COPY_ADMIN_KEY = True
+  shrink_osd: COPY_ADMIN_KEY = True
+
+  rhcs: CEPH_STABLE_RELEASE = luminous
+  dev: CEPH_STABLE_RELEASE = nautilus
+  dev: CEPH_DOCKER_IMAGE_TAG = latest
+  dev: CEPH_DOCKER_IMAGE_TAG_BIS = latest-bis
+  dev: UPDATE_CEPH_STABLE_RELEASE = nautilus
+  dev: UPDATE_CEPH_DOCKER_IMAGE_TAG = latest
   update_cluster: ROLLING_UPDATE = True
+  update_cluster: CEPH_STABLE_RELEASE = mimic
+  update_cluster: UPDATE_CEPH_STABLE_RELEASE = nautilus
   update_docker_cluster: ROLLING_UPDATE = True
-  add_osds: CEPH_STABLE_RELEASE = luminous
-  add_osds_container: CEPH_STABLE_RELEASE = luminous
-  rgw_multisite: CEPH_STABLE_RELEASE = luminous
-  rgw_multisite_container: CEPH_STABLE_RELEASE = luminous
+  update_docker_cluster: CEPH_STABLE_RELEASE = mimic
+  update_docker_cluster: CEPH_DOCKER_IMAGE_TAG = latest-mimic
+  update_docker_cluster: UPDATE_CEPH_DOCKER_IMAGE_TAG = latest
+
   ooo_collocation: CEPH_DOCKER_IMAGE_TAG = v3.0.3-stable-3.0-luminous-centos-7-x86_64
 deps= -r{toxinidir}/tests/requirements.txt
 changedir=
@@ -287,8 +292,6 @@ changedir=
   lvm_batch_container: {toxinidir}/tests/functional/centos/7/lvm-batch-container
   bluestore_lvm_osds: {toxinidir}/tests/functional/centos/7/bs-lvm-osds
   bluestore_lvm_osds_container: {toxinidir}/tests/functional/centos/7/bs-lvm-osds-container
-  purge_lvm_osds: {toxinidir}/tests/functional/centos/7/lvm-osds
-  purge_lvm_osds_container: {toxinidir}/tests/functional/centos/7/lvm-osds-container
   ooo_collocation: {toxinidir}/tests/functional/centos/7/ooo-collocation
   add_osds: {toxinidir}/tests/functional/centos/7/add-osds
   add_osds_container: {toxinidir}/tests/functional/centos/7/add-osds-container
@@ -317,8 +320,6 @@ commands=
   shrink_osd_container: ansible-playbook -vv -i {changedir}/hosts {toxinidir}/tests/functional/lvm_setup.yml
   shrink_mon: ansible-playbook -vv -i {changedir}/hosts {toxinidir}/tests/functional/lvm_setup.yml
   shrink_mon_container: ansible-playbook -vv -i {changedir}/hosts {toxinidir}/tests/functional/lvm_setup.yml
-  purge_lvm_osds: ansible-playbook -vv -i {changedir}/hosts {toxinidir}/tests/functional/lvm_setup.yml
-  purge_lvm_osds_container: ansible-playbook -vv -i {changedir}/hosts {toxinidir}/tests/functional/lvm_setup.yml
   update_docker_cluster: ansible-playbook -vv -i {changedir}/hosts {toxinidir}/tests/functional/lvm_setup.yml
   update_cluster: ansible-playbook -vv -i {changedir}/hosts {toxinidir}/tests/functional/lvm_setup.yml
   purge_cluster_non_container: ansible-playbook -vv -i {changedir}/hosts {toxinidir}/tests/functional/lvm_setup.yml
@@ -336,7 +337,7 @@ commands=
   ansible-playbook -vv -i {changedir}/hosts {toxinidir}/{env:PLAYBOOK:site.yml.sample} --extra-vars "\
       delegate_facts_host={env:DELEGATE_FACTS_HOST:True} \
       fetch_directory={env:FETCH_DIRECTORY:{changedir}/fetch} \
-      ceph_stable_release={env:CEPH_STABLE_RELEASE:mimic} \
+      ceph_stable_release={env:CEPH_STABLE_RELEASE:nautilus} \
       ceph_docker_registry={env:CEPH_DOCKER_REGISTRY:docker.io} \
       ceph_docker_image={env:CEPH_DOCKER_IMAGE:ceph/daemon} \
       ceph_docker_image_tag={env:CEPH_DOCKER_IMAGE_TAG:latest-master} \
@@ -374,12 +375,6 @@ commands=
 
   purge_cluster_non_container: {[purge]commands}
   purge_cluster_container: {[purge]commands}
-  purge_filestore_osds_non_container: {[purge]commands}
-  purge_bluestore_osds_non_container: {[purge]commands}
-  purge_filestore_osds_container: {[purge]commands}
-  purge_bluestore_osds_container: {[purge]commands}
-  purge_lvm_osds: {[purge-lvm]commands}
-  purge_lvm_osds_container: {[purge-lvm]commands}
   switch_to_containers: {[switch-to-containers]commands}
   update_cluster: {[update]commands}
   update_docker_cluster: {[update]commands}