From 2c64166eac98e6afa3d441b9af9ce029027c6aad Mon Sep 17 00:00:00 2001 From: Guillaume Abrioux Date: Mon, 15 Jul 2019 10:57:46 +0200 Subject: [PATCH] tests: remove useless setting this setting is not needed here since we explicitely set it for container and non container context. Signed-off-by: Guillaume Abrioux (cherry picked from commit 87b173d02252f3781c36ac3ed26f575397e9c410) --- tox-dashboard.ini | 2 -- tox-update.ini | 2 -- tox.ini | 2 -- 3 files changed, 6 deletions(-) diff --git a/tox-dashboard.ini b/tox-dashboard.ini index 764720edd..4321a02d0 100644 --- a/tox-dashboard.ini +++ b/tox-dashboard.ini @@ -22,8 +22,6 @@ setenv= # only available for ansible >= 2.5 ANSIBLE_STDOUT_CALLBACK = yaml # non_container: DEV_SETUP = True - centos: CEPH_ANSIBLE_VAGRANT_BOX = centos/7 - fedora: CEPH_ANSIBLE_VAGRANT_BOX = fedora/29-atomic-host # Set the vagrant box image to use centos-non_container: CEPH_ANSIBLE_VAGRANT_BOX = centos/7 centos-container: CEPH_ANSIBLE_VAGRANT_BOX = centos/atomic-host diff --git a/tox-update.ini b/tox-update.ini index 34e89e5ba..9ca7fa156 100644 --- a/tox-update.ini +++ b/tox-update.ini @@ -21,8 +21,6 @@ setenv= # only available for ansible >= 2.5 ANSIBLE_STDOUT_CALLBACK = yaml # non_container: DEV_SETUP = True - centos: CEPH_ANSIBLE_VAGRANT_BOX = centos/7 - fedora: CEPH_ANSIBLE_VAGRANT_BOX = fedora/29-atomic-host # Set the vagrant box image to use centos-non_container: CEPH_ANSIBLE_VAGRANT_BOX = centos/7 centos-container: CEPH_ANSIBLE_VAGRANT_BOX = centos/atomic-host diff --git a/tox.ini b/tox.ini index 6f1074658..23ff2a177 100644 --- a/tox.ini +++ b/tox.ini @@ -357,8 +357,6 @@ setenv= # only available for ansible >= 2.5 ANSIBLE_STDOUT_CALLBACK = yaml non_container: DEV_SETUP = True - centos: CEPH_ANSIBLE_VAGRANT_BOX = centos/7 - fedora: CEPH_ANSIBLE_VAGRANT_BOX = fedora/29-atomic-host # Set the vagrant box image to use centos-non_container: CEPH_ANSIBLE_VAGRANT_BOX = centos/7 centos-container: CEPH_ANSIBLE_VAGRANT_BOX = centos/atomic-host