tests: update to use almalinux-9

almalinux-8 is going away since CentOS 8 EOL prevents use of the
advanced virtualization repository.

Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>

8 files changed, 8 insertions, 10 deletions

diff --git a/tests/data/formatters/out/libvirt-go-xml-module-almalinux-8.Dockerfile b/tests/data/formatters/out/libvirt-go-xml-module-almalinux-9.Dockerfile
index 4a3bbe7..69a4e62 100644
--- a/tests/data/formatters/out/libvirt-go-xml-module-almalinux-8.Dockerfile
+++ b/tests/data/formatters/out/libvirt-go-xml-module-almalinux-9.Dockerfile
@@ -1,9 +1,8 @@
-FROM docker.io/library/almalinux:8
+FROM docker.io/library/almalinux:9
 
 RUN dnf update -y && \
     dnf install 'dnf-command(config-manager)' -y && \
-    dnf config-manager --set-enabled -y powertools && \
-    dnf install -y centos-release-advanced-virtualization && \
+    dnf config-manager --set-enabled -y crb && \
     dnf install -y epel-release && \
     dnf install -y \
         ca-certificates \
diff --git a/tests/data/formatters/out/libvirt-go-xml-module-almalinux-8.json b/tests/data/formatters/out/libvirt-go-xml-module-almalinux-9.json
index 81f8114..81f8114 100644
--- a/tests/data/formatters/out/libvirt-go-xml-module-almalinux-8.json
+++ b/tests/data/formatters/out/libvirt-go-xml-module-almalinux-9.json
diff --git a/tests/data/formatters/out/libvirt-go-xml-module-almalinux-8.sh b/tests/data/formatters/out/libvirt-go-xml-module-almalinux-9.sh
index 3039c26..720daa5 100644
--- a/tests/data/formatters/out/libvirt-go-xml-module-almalinux-8.sh
+++ b/tests/data/formatters/out/libvirt-go-xml-module-almalinux-9.sh
@@ -1,8 +1,7 @@
 function install_buildenv() {
     dnf update -y
     dnf install 'dnf-command(config-manager)' -y
-    dnf config-manager --set-enabled -y powertools
-    dnf install -y centos-release-advanced-virtualization
+    dnf config-manager --set-enabled -y crb
     dnf install -y epel-release
     dnf install -y \
         ca-certificates \
diff --git a/tests/data/formatters/out/libvirt-go-xml-module-almalinux-8.vars b/tests/data/formatters/out/libvirt-go-xml-module-almalinux-9.vars
index e97254c..e97254c 100644
--- a/tests/data/formatters/out/libvirt-go-xml-module-almalinux-8.vars
+++ b/tests/data/formatters/out/libvirt-go-xml-module-almalinux-9.vars
diff --git a/tests/data/formatters/out/libvirt-go-xml-module-almalinux-8.yaml b/tests/data/formatters/out/libvirt-go-xml-module-almalinux-9.yaml
index d775525..d775525 100644
--- a/tests/data/formatters/out/libvirt-go-xml-module-almalinux-8.yaml
+++ b/tests/data/formatters/out/libvirt-go-xml-module-almalinux-9.yaml
diff --git a/tests/test_commands.py b/tests/test_commands.py
index d59fe06..cec79b8 100644
--- a/tests/test_commands.py
+++ b/tests/test_commands.py
@@ -14,8 +14,8 @@ cli_args = [
     ["--help"],
     ["targets"],
     ["projects"],
-    ["variables", "almalinux-8", "libvirt-go-module"],
-    ["dockerfile", "almalinux-8", "libvirt-go-module"],
+    ["variables", "almalinux-9", "libvirt-go-module"],
+    ["dockerfile", "almalinux-9", "libvirt-go-module"],
     ["manifest", "-n", Path(__file__).parent.parent.joinpath("examples", "manifest.yml")],
     ["container", "engines"]
 ]
diff --git a/tests/test_formatters.py b/tests/test_formatters.py
index 0300954..3119ff5 100644
--- a/tests/test_formatters.py
+++ b/tests/test_formatters.py
@@ -18,7 +18,7 @@ from lcitool.formatters import ShellBuildEnvFormatter
 scenarios = [
     # A minimalist application, testing package managers
     pytest.param("libvirt-go-xml-module", "debian-12", "x86_64", None, id="libvirt-go-xml-module-debian-12"),
-    pytest.param("libvirt-go-xml-module", "almalinux-8", "x86_64", None, id="libvirt-go-xml-module-almalinux-8"),
+    pytest.param("libvirt-go-xml-module", "almalinux-9", "x86_64", None, id="libvirt-go-xml-module-almalinux-9"),
     pytest.param("libvirt-go-xml-module", "opensuse-leap-15", "x86_64", None, id="libvirt-go-xml-module-opensuse-leap-15"),
     pytest.param("libvirt-go-xml-module", "alpine-edge", "x86_64", None, id="libvirt-go-xml-module-alpine-edge"),
     pytest.param("libvirt-go-xml-module", "opensuse-tumbleweed", "x86_64", None, id="libvirt-go-xml-module-opensuse-tumbleweed"),
diff --git a/tests/test_manifest.py b/tests/test_manifest.py
index 64ead87..35b6916 100644
--- a/tests/test_manifest.py
+++ b/tests/test_manifest.py
@@ -48,7 +48,7 @@ def test_generate(assert_equal, targets, packages, projects, monkeypatch):
             # to be re-written
             Path("ci", "cirrus", "freebsd-current.vars"),
             # to be deleted
-            Path("ci", "containers", "almalinux-8.Dockerfile"),
+            Path("ci", "containers", "almalinux-9.Dockerfile"),
             # to be re-written
             Path("ci", "containers", "fedora-rawhide.Dockerfile"),
         ))
@@ -100,7 +100,7 @@ def test_generate(assert_equal, targets, packages, projects, monkeypatch):
 
         # Verify which files we expect to be deleted
         assert_unlink(Path("ci", "cirrus", "freebsd-9.vars"))
-        assert_unlink(Path("ci", "containers", "almalinux-8.Dockerfile"))
+        assert_unlink(Path("ci", "containers", "almalinux-9.Dockerfile"))
 
         # Verify content of files we expect to be created
         assert_writes = [