]> git.apps.os.sepia.ceph.com Git - ceph-ansible.git/commitdiff
tests: use centos stream-8 instead of centos 8
authorGuillaume Abrioux <gabrioux@redhat.com>
Mon, 31 Jan 2022 12:42:10 +0000 (13:42 +0100)
committerGuillaume Abrioux <gabrioux@redhat.com>
Mon, 31 Jan 2022 14:58:58 +0000 (15:58 +0100)
CentOS 8 is EOL as of December 2021.
Let's use CentOS stream 8 instead.

Signed-off-by: Guillaume Abrioux <gabrioux@redhat.com>
tests/functional/cephadm/vagrant_variables.yml
tests/scripts/vagrant_up.sh
tox-cephadm.ini
tox-external_clients.ini
tox-filestore_to_bluestore.ini
tox-podman.ini
tox-shrink_osd.ini
tox-subset_update.ini
tox-update.ini
tox.ini

index b2c2e7cc87abd322022c6e31897a7908a0f0ef2b..d3d23246482423aae2069d5de80cd687d932d796 100644 (file)
@@ -23,7 +23,7 @@ cluster_subnet: 192.168.31
 # set 1024 for CentOS
 memory: 2048
 
-vagrant_box: centos/8
+vagrant_box: centos/stream8
 # The sync directory changes based on vagrant box
 # Set to /home/vagrant/sync for Centos/7, /home/{ user }/vagrant for openstack and defaults to /vagrant
 #vagrant_sync_dir: /home/vagrant/sync
index e5bbd2268906bae61bffbfac31a3ab3aa9cd42f3..ffe88142f3b4eaf5def2ad11a6559162e4eb36e8 100644 (file)
@@ -1,7 +1,7 @@
 #!/bin/bash
 
-vagrant box remove --force --provider libvirt --box-version 0 centos/8 || true
-vagrant box add --provider libvirt --name centos/8 https://cloud.centos.org/centos/8/vagrant/x86_64/images/CentOS-8-Vagrant-8.4.2105-20210603.0.x86_64.vagrant-libvirt.box || true
+vagrant box remove --force --provider libvirt --box-version 0 centos/stream8 || true
+vagrant box add --provider libvirt --name centos/stream8 https://cloud.centos.org/centos/8-stream/x86_64/images/CentOS-Stream-Vagrant-8-20220125.1.x86_64.vagrant-libvirt.box || true
 
 retries=0
 until [ $retries -ge 5 ]
index b4c814e8735ea356946b27a3d1606132e58a1a51..a58a14f3f1866c8d4742f09451915d50b8693125 100644 (file)
@@ -21,7 +21,7 @@ setenv=
   # only available for ansible >= 2.5
   ANSIBLE_STDOUT_CALLBACK = yaml
   # Set the vagrant box image to use
-  CEPH_ANSIBLE_VAGRANT_BOX = centos/8
+  CEPH_ANSIBLE_VAGRANT_BOX = centos/stream8
 
 deps= -r{toxinidir}/tests/requirements.txt
 changedir= {toxinidir}/tests/functional/cephadm
index 7a78f413edebfec8a81f97c9127c6a8d5f2fd89e..0022a399a86a750c76a48fb9cc41d431d099f683 100644 (file)
@@ -20,8 +20,8 @@ setenv=
   ANSIBLE_STDOUT_CALLBACK = yaml
 #  non_container: DEV_SETUP = True
   # Set the vagrant box image to use
-  centos-non_container: CEPH_ANSIBLE_VAGRANT_BOX = centos/8
-  centos-container: CEPH_ANSIBLE_VAGRANT_BOX = centos/8
+  centos-non_container: CEPH_ANSIBLE_VAGRANT_BOX = centos/stream8
+  centos-container: CEPH_ANSIBLE_VAGRANT_BOX = centos/stream8
 
   container: CONTAINER_DIR = /container
   container: PLAYBOOK = site-container.yml.sample
index 695eff2c193bd6588dbeec8f2a2640877a6bb293..44a508218fb78c9a8a542bd96748b65c8af4c9d1 100644 (file)
@@ -20,8 +20,8 @@ setenv=
   ANSIBLE_STDOUT_CALLBACK = yaml
 #  non_container: DEV_SETUP = True
   # Set the vagrant box image to use
-  centos-non_container: CEPH_ANSIBLE_VAGRANT_BOX = centos/8
-  centos-container: CEPH_ANSIBLE_VAGRANT_BOX = centos/8
+  centos-non_container: CEPH_ANSIBLE_VAGRANT_BOX = centos/stream8
+  centos-container: CEPH_ANSIBLE_VAGRANT_BOX = centos/stream8
 
   # Set the ansible inventory host file to be used according to which distrib we are running on
   INVENTORY = {env:_INVENTORY:hosts}
index 3f9644aea63607fae6c531657211e40235d1159f..1c9307a3e39a6a5eb49f1b34e775613f587db33c 100644 (file)
@@ -21,7 +21,7 @@ setenv=
   # only available for ansible >= 2.5
   ANSIBLE_STDOUT_CALLBACK = yaml
   # Set the vagrant box image to use
-  CEPH_ANSIBLE_VAGRANT_BOX = centos/8
+  CEPH_ANSIBLE_VAGRANT_BOX = centos/stream8
 
   # Set the ansible inventory host file to be used according to which distrib we are running on
   INVENTORY = {env:_INVENTORY:hosts}
index b8a7c719eac863c6217ad26ab6750fff1abaf5ca..6f7168d98e5557c274d8c995c7e89dec2470d5b8 100644 (file)
@@ -61,8 +61,8 @@ setenv=
   ANSIBLE_STDOUT_CALLBACK = yaml
   non_container: DEV_SETUP = True
   # Set the vagrant box image to use
-  centos-non_container: CEPH_ANSIBLE_VAGRANT_BOX = centos/8
-  centos-container: CEPH_ANSIBLE_VAGRANT_BOX = centos/8
+  centos-non_container: CEPH_ANSIBLE_VAGRANT_BOX = centos/stream8
+  centos-container: CEPH_ANSIBLE_VAGRANT_BOX = centos/stream8
   INVENTORY = {env:_INVENTORY:hosts}
   container: CONTAINER_DIR = /container
   container: PLAYBOOK = site-container.yml.sample
index 98a0b12a3a0b3a206cc6c76fb242a7cccea1883c..dc50a8082f8e5c3ade68ff8297e5d386718b9fae 100644 (file)
@@ -20,8 +20,8 @@ setenv=
   ANSIBLE_STDOUT_CALLBACK = yaml
 #  non_container: DEV_SETUP = True
   # Set the vagrant box image to use
-  centos-non_container: CEPH_ANSIBLE_VAGRANT_BOX = centos/8
-  centos-container: CEPH_ANSIBLE_VAGRANT_BOX = centos/8
+  centos-non_container: CEPH_ANSIBLE_VAGRANT_BOX = centos/stream8
+  centos-container: CEPH_ANSIBLE_VAGRANT_BOX = centos/stream8
 
   INVENTORY = {env:_INVENTORY:hosts}
   container: CONTAINER_DIR = /container
index a1e25d1e1b23db2c3391e0b53bde8874c863e6f5..f9dfb35cbd1082b2b2d40b97d04f5324e1d18dce 100644 (file)
@@ -20,8 +20,8 @@ setenv=
   ANSIBLE_STDOUT_CALLBACK = yaml
 #  non_container: DEV_SETUP = True
   # Set the vagrant box image to use
-  centos-non_container: CEPH_ANSIBLE_VAGRANT_BOX = centos/8
-  centos-container: CEPH_ANSIBLE_VAGRANT_BOX = centos/8
+  centos-non_container: CEPH_ANSIBLE_VAGRANT_BOX = centos/stream8
+  centos-container: CEPH_ANSIBLE_VAGRANT_BOX = centos/stream8
 
   INVENTORY = {env:_INVENTORY:hosts}
   container: CONTAINER_DIR = /container
diff --git a/tox.ini b/tox.ini
index 15868173bc78ab76079625d5641a4589d26ff468..45370c567bd3f3cc326a686abbda80e7a8106695 100644 (file)
--- a/tox.ini
+++ b/tox.ini
@@ -303,8 +303,8 @@ setenv=
   ANSIBLE_STDOUT_CALLBACK = yaml
   non_container: DEV_SETUP = True
   # Set the vagrant box image to use
-  centos-non_container: CEPH_ANSIBLE_VAGRANT_BOX = centos/8
-  centos-container: CEPH_ANSIBLE_VAGRANT_BOX = centos/8
+  centos-non_container: CEPH_ANSIBLE_VAGRANT_BOX = centos/stream8
+  centos-container: CEPH_ANSIBLE_VAGRANT_BOX = centos/stream8
   INVENTORY = {env:_INVENTORY:hosts}
   container: CONTAINER_DIR = /container
   container: PLAYBOOK = site-container.yml.sample