From 18702ac60ed3575e9d5af0620e8a4ea9158d7d9b Mon Sep 17 00:00:00 2001 From: Guillaume Abrioux Date: Mon, 2 Sep 2024 10:18:02 +0200 Subject: [PATCH] tests: use rocky linux 8 wip Signed-off-by: Guillaume Abrioux --- tests/scripts/vagrant_up.sh | 5 +++++ tox.ini | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/tests/scripts/vagrant_up.sh b/tests/scripts/vagrant_up.sh index cb8127258d..506ba43267 100644 --- a/tests/scripts/vagrant_up.sh +++ b/tests/scripts/vagrant_up.sh @@ -6,6 +6,11 @@ if [[ "${CEPH_ANSIBLE_VAGRANT_BOX}" =~ "centos/stream" ]]; then vagrant box remove "${CEPH_ANSIBLE_VAGRANT_BOX}" --all --force || true vagrant box add --force --provider libvirt --name "${CEPH_ANSIBLE_VAGRANT_BOX}" "https://cloud.centos.org/centos/${EL_VERSION}-stream/x86_64/images/${LATEST_IMAGE}" --force fi +# Rocky-8-Vagrant-Libvirt.latest.x86_64.box +if [[ "${CEPH_ANSIBLE_VAGRANT_BOX}" =~ "rockylinux/8" ]]; then + vagrant box remove "${CEPH_ANSIBLE_VAGRANT_BOX}" --all --force || true + vagrant box add --force --provider libvirt --name "${CEPH_ANSIBLE_VAGRANT_BOX}" "https://dl.rockylinux.org/pub/rocky/8.10/images/x86_64/Rocky-8-Vagrant-Vbox.latest.x86_64.box" --force +fi retries=0 until [ $retries -ge 5 ] diff --git a/tox.ini b/tox.ini index d4f821fda8..45f4e020e3 100644 --- a/tox.ini +++ b/tox.ini @@ -277,7 +277,7 @@ 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/stream9 + centos-non_container: CEPH_ANSIBLE_VAGRANT_BOX = rockylinux/8 centos-container: CEPH_ANSIBLE_VAGRANT_BOX = centos/stream9 INVENTORY = {env:_INVENTORY:hosts} container: CONTAINER_DIR = /container