]> git.apps.os.sepia.ceph.com Git - ceph-ansible.git/commitdiff
tests: use rocky linux 8 backport-rockylinux-support-to-stable-6.0 7606/head
authorGuillaume Abrioux <gabrioux@ibm.com>
Mon, 2 Sep 2024 08:18:02 +0000 (10:18 +0200)
committerGuillaume Abrioux <gabrioux@ibm.com>
Mon, 2 Sep 2024 08:34:08 +0000 (10:34 +0200)
wip

Signed-off-by: Guillaume Abrioux <gabrioux@ibm.com>
tests/scripts/vagrant_up.sh
tox.ini

index cb8127258d7b7adf6c35bf2e2abfbead6dfd5407..4feafd4de1559176e818096bb725e0ffbbbe3c4f 100644 (file)
@@ -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 d4f821fda85afb78edbcb2b3543416dfe157ac64..45f4e020e3d64bac3d90fae07bc06c62ffd0c54b 100644 (file)
--- 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