From 07f7c190854efbc159578524d539c7566898da8e 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 | 7 +++++++ tox.ini | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/tests/scripts/vagrant_up.sh b/tests/scripts/vagrant_up.sh index cb8127258..4feafd4de 100644 --- a/tests/scripts/vagrant_up.sh +++ b/tests/scripts/vagrant_up.sh @@ -1,11 +1,18 @@ #!/bin/bash +set -x + if [[ "${CEPH_ANSIBLE_VAGRANT_BOX}" =~ "centos/stream" ]]; then EL_VERSION="${CEPH_ANSIBLE_VAGRANT_BOX: -1}" LATEST_IMAGE="$(curl -s https://cloud.centos.org/centos/${EL_VERSION}-stream/x86_64/images/CHECKSUM | sed -nE 's/^SHA256.*\((.*-([0-9]+).*vagrant-libvirt.box)\).*$/\1/p' | sort -u | tail -n1)" 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 d4f821fda..45f4e020e 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 -- 2.47.3