]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph-ansible.git/commitdiff
tests: remove useless setting v4.0.0rc11
authorGuillaume Abrioux <gabrioux@redhat.com>
Mon, 15 Jul 2019 08:57:46 +0000 (10:57 +0200)
committermergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
Wed, 17 Jul 2019 09:04:20 +0000 (09:04 +0000)
this setting is not needed here since we explicitely set it for
container and non container context.

Signed-off-by: Guillaume Abrioux <gabrioux@redhat.com>
(cherry picked from commit 87b173d02252f3781c36ac3ed26f575397e9c410)

tox-dashboard.ini
tox-update.ini
tox.ini

index 764720edde8bf697548bdb8d4f12c092903ec11b..4321a02d034d6afc774472d9a1b35960a4348184 100644 (file)
@@ -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
index 34e89e5ba200d162ccc2059beae5cdc251bdd33d..9ca7fa156ea6eb962a0da4943c2ca4ccfa04211c 100644 (file)
@@ -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 6f10746586d0ab9ce4cabe32ecb7fcecf4882699..23ff2a17711ee3d22d83c8b4c42c4668262ff690 100644 (file)
--- 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