Skip to content

Commit 9916c2d

Browse files
guitsguits
committed
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 bc36f60)
1 parent f7389ec commit 9916c2d

10 files changed

+17
-17
lines changed

‎tests/functional/cephadm/vagrant_variables.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ cluster_subnet: 192.168.31
2323
# set 1024 for CentOS
2424
memory: 2048
2525

26-
vagrant_box: centos/8
26+
vagrant_box: centos/stream8
2727
# The sync directory changes based on vagrant box
2828
# Set to /home/vagrant/sync for Centos/7, /home/{ user }/vagrant for openstack and defaults to /vagrant
2929
#vagrant_sync_dir: /home/vagrant/sync

‎tests/scripts/vagrant_up.sh

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#!/bin/bash
22

3-
vagrant box remove --force --provider libvirt --box-version 0 centos/8 || true
4-
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
3+
vagrant box remove --force --provider libvirt --box-version 0 centos/stream8 || true
4+
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
55

66
retries=0
77
until [ $retries -ge 5 ]

‎tox-cephadm.ini

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ setenv=
2121
# only available for ansible >= 2.5
2222
ANSIBLE_STDOUT_CALLBACK = yaml
2323
# Set the vagrant box image to use
24-
CEPH_ANSIBLE_VAGRANT_BOX = centos/8
24+
CEPH_ANSIBLE_VAGRANT_BOX = centos/stream8
2525

2626
deps= -r{toxinidir}/tests/requirements.txt
2727
changedir= {toxinidir}/tests/functional/cephadm

‎tox-external_clients.ini

+2-2
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@ setenv=
2020
ANSIBLE_STDOUT_CALLBACK = yaml
2121
# non_container: DEV_SETUP = True
2222
# Set the vagrant box image to use
23-
centos-non_container: CEPH_ANSIBLE_VAGRANT_BOX = centos/8
24-
centos-container: CEPH_ANSIBLE_VAGRANT_BOX = centos/8
23+
centos-non_container: CEPH_ANSIBLE_VAGRANT_BOX = centos/stream8
24+
centos-container: CEPH_ANSIBLE_VAGRANT_BOX = centos/stream8
2525

2626
container: CONTAINER_DIR = /container
2727
container: PLAYBOOK = site-container.yml.sample

‎tox-filestore_to_bluestore.ini

+2-2
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@ setenv=
2020
ANSIBLE_STDOUT_CALLBACK = yaml
2121
# non_container: DEV_SETUP = True
2222
# Set the vagrant box image to use
23-
centos-non_container: CEPH_ANSIBLE_VAGRANT_BOX = centos/8
24-
centos-container: CEPH_ANSIBLE_VAGRANT_BOX = centos/8
23+
centos-non_container: CEPH_ANSIBLE_VAGRANT_BOX = centos/stream8
24+
centos-container: CEPH_ANSIBLE_VAGRANT_BOX = centos/stream8
2525

2626
# Set the ansible inventory host file to be used according to which distrib we are running on
2727
INVENTORY = {env:_INVENTORY:hosts}

‎tox-podman.ini

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ setenv=
2121
# only available for ansible >= 2.5
2222
ANSIBLE_STDOUT_CALLBACK = yaml
2323
# Set the vagrant box image to use
24-
CEPH_ANSIBLE_VAGRANT_BOX = centos/8
24+
CEPH_ANSIBLE_VAGRANT_BOX = centos/stream8
2525

2626
# Set the ansible inventory host file to be used according to which distrib we are running on
2727
INVENTORY = {env:_INVENTORY:hosts}

‎tox-shrink_osd.ini

+2-2
Original file line numberDiff line numberDiff line change
@@ -61,8 +61,8 @@ setenv=
6161
ANSIBLE_STDOUT_CALLBACK = yaml
6262
non_container: DEV_SETUP = True
6363
# Set the vagrant box image to use
64-
centos-non_container: CEPH_ANSIBLE_VAGRANT_BOX = centos/8
65-
centos-container: CEPH_ANSIBLE_VAGRANT_BOX = centos/8
64+
centos-non_container: CEPH_ANSIBLE_VAGRANT_BOX = centos/stream8
65+
centos-container: CEPH_ANSIBLE_VAGRANT_BOX = centos/stream8
6666
INVENTORY = {env:_INVENTORY:hosts}
6767
container: CONTAINER_DIR = /container
6868
container: PLAYBOOK = site-container.yml.sample

‎tox-subset_update.ini

+2-2
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@ setenv=
2020
ANSIBLE_STDOUT_CALLBACK = yaml
2121
# non_container: DEV_SETUP = True
2222
# Set the vagrant box image to use
23-
centos-non_container: CEPH_ANSIBLE_VAGRANT_BOX = centos/8
24-
centos-container: CEPH_ANSIBLE_VAGRANT_BOX = centos/8
23+
centos-non_container: CEPH_ANSIBLE_VAGRANT_BOX = centos/stream8
24+
centos-container: CEPH_ANSIBLE_VAGRANT_BOX = centos/stream8
2525

2626
INVENTORY = {env:_INVENTORY:hosts}
2727
container: CONTAINER_DIR = /container

‎tox-update.ini

+2-2
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@ setenv=
2020
ANSIBLE_STDOUT_CALLBACK = yaml
2121
# non_container: DEV_SETUP = True
2222
# Set the vagrant box image to use
23-
centos-non_container: CEPH_ANSIBLE_VAGRANT_BOX = centos/8
24-
centos-container: CEPH_ANSIBLE_VAGRANT_BOX = centos/8
23+
centos-non_container: CEPH_ANSIBLE_VAGRANT_BOX = centos/stream8
24+
centos-container: CEPH_ANSIBLE_VAGRANT_BOX = centos/stream8
2525

2626
INVENTORY = {env:_INVENTORY:hosts}
2727
container: CONTAINER_DIR = /container

‎tox.ini

+2-2
Original file line numberDiff line numberDiff line change
@@ -277,8 +277,8 @@ setenv=
277277
ANSIBLE_STDOUT_CALLBACK = yaml
278278
non_container: DEV_SETUP = True
279279
# Set the vagrant box image to use
280-
centos-non_container: CEPH_ANSIBLE_VAGRANT_BOX = centos/8
281-
centos-container: CEPH_ANSIBLE_VAGRANT_BOX = centos/8
280+
centos-non_container: CEPH_ANSIBLE_VAGRANT_BOX = centos/stream8
281+
centos-container: CEPH_ANSIBLE_VAGRANT_BOX = centos/stream8
282282
INVENTORY = {env:_INVENTORY:hosts}
283283
container: CONTAINER_DIR = /container
284284
container: PLAYBOOK = site-container.yml.sample

0 commit comments

Comments
 (0)