tests: use centos stream-8 instead of centos 8

CentOS 8 is EOL as of December 2021.
Let's use CentOS stream 8 instead.

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

diff --git a/tests/functional/cephadm/vagrant_variables.yml b/tests/functional/cephadm/vagrant_variables.yml
index b2c2e7cc87abd322022c6e31897a7908a0f0ef2b..d3d23246482423aae2069d5de80cd687d932d796 100644 (file)
--- a/tests/functional/cephadm/vagrant_variables.yml
+++ b/tests/functional/cephadm/vagrant_variables.yml
@@ -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

diff --git a/tests/scripts/vagrant_up.sh b/tests/scripts/vagrant_up.sh
index e90b7d543a5663ca18c11ee618ace1538d239bbb..b3a15f08d4dbc0f4e354272099d3f6101f234bb9 100644 (file)
--- a/tests/scripts/vagrant_up.sh
+++ b/tests/scripts/vagrant_up.sh
@@ -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 ]

diff --git a/tox-cephadm.ini b/tox-cephadm.ini
index cf4ac6635a870eb840201521a2105b151d35516b..a8cea99b137bce5d35d6b01648e1e8a2ce5010b0 100644 (file)
--- a/tox-cephadm.ini
+++ b/tox-cephadm.ini
@@ -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

diff --git a/tox-external_clients.ini b/tox-external_clients.ini
index d6d69e1dc0451101eef3a51afad6e9113df03f04..0b00bd59b1e7ab252a74d3062b07f736feec1b75 100644 (file)
--- a/tox-external_clients.ini
+++ b/tox-external_clients.ini
@@ -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

diff --git a/tox-filestore_to_bluestore.ini b/tox-filestore_to_bluestore.ini
index 0c892b7a6bb2538f9de7fc177ff89ca1cc2de44c..fba2b780f73d0e9744fb60aa61d82bb5f70ce2e0 100644 (file)
--- a/tox-filestore_to_bluestore.ini
+++ b/tox-filestore_to_bluestore.ini
@@ -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
   ubuntu: CEPH_ANSIBLE_VAGRANT_BOX = guits/ubuntu-bionic64
 
   # Set the ansible inventory host file to be used according to which distrib we are running on

diff --git a/tox-podman.ini b/tox-podman.ini
index 3f9644aea63607fae6c531657211e40235d1159f..1c9307a3e39a6a5eb49f1b34e775613f587db33c 100644 (file)
--- a/tox-podman.ini
+++ b/tox-podman.ini
@@ -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}

diff --git a/tox-shrink_osd.ini b/tox-shrink_osd.ini
index ef6905cd14798bbbaae4c31a164698af2f9c776e..6485169b4230fab54802161aa9056b450adc24ac 100644 (file)
--- a/tox-shrink_osd.ini
+++ b/tox-shrink_osd.ini
@@ -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

diff --git a/tox-subset_update.ini b/tox-subset_update.ini
index 679de67ca2ea90e4f3e7508c09827d23e1e1b84e..7d7f9da497023e9d7db21ffe3a10ef7e6469a7f1 100644 (file)
--- a/tox-subset_update.ini
+++ b/tox-subset_update.ini
@@ -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-update.ini b/tox-update.ini
index 967d1b04566938da426af5e43c73751334bc34b9..c850ef6eb9955e486b9bd02156dab76c650c7cfa 100644 (file)
--- a/tox-update.ini
+++ b/tox-update.ini
@@ -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
   ubuntu: CEPH_ANSIBLE_VAGRANT_BOX = guits/ubuntu-bionic64
 
   # Set the ansible inventory host file to be used according to which distrib we are running on

diff --git a/tox.ini b/tox.ini
index ff93d4acb1671a34ad8a2c6b1e2d23f6c5cfa212..5202a3ee7b9b593803659d14dbb3b35f43412968 100644 (file)
--- a/tox.ini
+++ b/tox.ini
@@ -333,8 +333,8 @@ setenv=
   # only available for ansible >= 2.5
   ANSIBLE_STDOUT_CALLBACK = yaml
   # 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
   ubuntu: CEPH_ANSIBLE_VAGRANT_BOX = guits/ubuntu-bionic64
 
   # Set the ansible inventory host file to be used according to which distrib we are running on