From 2fde171f79867f452dcfc7af27cbd96c4d9d0b42 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= Date: Thu, 13 Jun 2024 10:00:21 +0100 Subject: tests: update to use almalinux-9 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit almalinux-8 is going away since CentOS 8 EOL prevents use of the advanced virtualization repository. Signed-off-by: Daniel P. Berrangé --- .../out/libvirt-go-xml-module-almalinux-8.Dockerfile | 17 ----------------- .../out/libvirt-go-xml-module-almalinux-8.json | 17 ----------------- .../formatters/out/libvirt-go-xml-module-almalinux-8.sh | 15 --------------- .../out/libvirt-go-xml-module-almalinux-8.vars | 10 ---------- .../out/libvirt-go-xml-module-almalinux-8.yaml | 5 ----- .../out/libvirt-go-xml-module-almalinux-9.Dockerfile | 16 ++++++++++++++++ .../out/libvirt-go-xml-module-almalinux-9.json | 17 +++++++++++++++++ .../formatters/out/libvirt-go-xml-module-almalinux-9.sh | 14 ++++++++++++++ .../out/libvirt-go-xml-module-almalinux-9.vars | 10 ++++++++++ .../out/libvirt-go-xml-module-almalinux-9.yaml | 5 +++++ tests/test_commands.py | 4 ++-- tests/test_formatters.py | 2 +- tests/test_manifest.py | 4 ++-- 13 files changed, 67 insertions(+), 69 deletions(-) delete mode 100644 tests/data/formatters/out/libvirt-go-xml-module-almalinux-8.Dockerfile delete mode 100644 tests/data/formatters/out/libvirt-go-xml-module-almalinux-8.json delete mode 100644 tests/data/formatters/out/libvirt-go-xml-module-almalinux-8.sh delete mode 100644 tests/data/formatters/out/libvirt-go-xml-module-almalinux-8.vars delete mode 100644 tests/data/formatters/out/libvirt-go-xml-module-almalinux-8.yaml create mode 100644 tests/data/formatters/out/libvirt-go-xml-module-almalinux-9.Dockerfile create mode 100644 tests/data/formatters/out/libvirt-go-xml-module-almalinux-9.json create mode 100644 tests/data/formatters/out/libvirt-go-xml-module-almalinux-9.sh create mode 100644 tests/data/formatters/out/libvirt-go-xml-module-almalinux-9.vars create mode 100644 tests/data/formatters/out/libvirt-go-xml-module-almalinux-9.yaml diff --git a/tests/data/formatters/out/libvirt-go-xml-module-almalinux-8.Dockerfile b/tests/data/formatters/out/libvirt-go-xml-module-almalinux-8.Dockerfile deleted file mode 100644 index 4a3bbe7..0000000 --- a/tests/data/formatters/out/libvirt-go-xml-module-almalinux-8.Dockerfile +++ /dev/null @@ -1,17 +0,0 @@ -FROM docker.io/library/almalinux:8 - -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 install -y epel-release && \ - dnf install -y \ - ca-certificates \ - git \ - glibc-langpack-en \ - golang && \ - dnf autoremove -y && \ - dnf clean all -y && \ - rpm -qa | sort > /packages.txt - -ENV LANG "en_US.UTF-8" \ No newline at end of file diff --git a/tests/data/formatters/out/libvirt-go-xml-module-almalinux-8.json b/tests/data/formatters/out/libvirt-go-xml-module-almalinux-8.json deleted file mode 100644 index 81f8114..0000000 --- a/tests/data/formatters/out/libvirt-go-xml-module-almalinux-8.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "ccache": "/usr/bin/ccache", - "cpan_pkgs": [], - "cross_pkgs": [], - "make": "/usr/bin/make", - "ninja": "/usr/bin/ninja", - "packaging_command": "dnf", - "pip3": "/usr/bin/pip3", - "pkgs": [ - "ca-certificates", - "git", - "glibc-langpack-en", - "golang" - ], - "pypi_pkgs": [], - "python": "/usr/bin/python3" -} \ No newline at end of file diff --git a/tests/data/formatters/out/libvirt-go-xml-module-almalinux-8.sh b/tests/data/formatters/out/libvirt-go-xml-module-almalinux-8.sh deleted file mode 100644 index 3039c26..0000000 --- a/tests/data/formatters/out/libvirt-go-xml-module-almalinux-8.sh +++ /dev/null @@ -1,15 +0,0 @@ -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 install -y epel-release - dnf install -y \ - ca-certificates \ - git \ - glibc-langpack-en \ - golang - rpm -qa | sort > /packages.txt -} - -export LANG="en_US.UTF-8" \ No newline at end of file diff --git a/tests/data/formatters/out/libvirt-go-xml-module-almalinux-8.vars b/tests/data/formatters/out/libvirt-go-xml-module-almalinux-8.vars deleted file mode 100644 index e97254c..0000000 --- a/tests/data/formatters/out/libvirt-go-xml-module-almalinux-8.vars +++ /dev/null @@ -1,10 +0,0 @@ -CCACHE='/usr/bin/ccache' -CPAN_PKGS='' -CROSS_PKGS='' -MAKE='/usr/bin/make' -NINJA='/usr/bin/ninja' -PACKAGING_COMMAND='dnf' -PIP3='/usr/bin/pip3' -PKGS='ca-certificates git glibc-langpack-en golang' -PYPI_PKGS='' -PYTHON='/usr/bin/python3' \ No newline at end of file diff --git a/tests/data/formatters/out/libvirt-go-xml-module-almalinux-8.yaml b/tests/data/formatters/out/libvirt-go-xml-module-almalinux-8.yaml deleted file mode 100644 index d775525..0000000 --- a/tests/data/formatters/out/libvirt-go-xml-module-almalinux-8.yaml +++ /dev/null @@ -1,5 +0,0 @@ -packages: - - ca-certificates - - git - - glibc-langpack-en - - golang diff --git a/tests/data/formatters/out/libvirt-go-xml-module-almalinux-9.Dockerfile b/tests/data/formatters/out/libvirt-go-xml-module-almalinux-9.Dockerfile new file mode 100644 index 0000000..69a4e62 --- /dev/null +++ b/tests/data/formatters/out/libvirt-go-xml-module-almalinux-9.Dockerfile @@ -0,0 +1,16 @@ +FROM docker.io/library/almalinux:9 + +RUN dnf update -y && \ + dnf install 'dnf-command(config-manager)' -y && \ + dnf config-manager --set-enabled -y crb && \ + dnf install -y epel-release && \ + dnf install -y \ + ca-certificates \ + git \ + glibc-langpack-en \ + golang && \ + dnf autoremove -y && \ + dnf clean all -y && \ + rpm -qa | sort > /packages.txt + +ENV LANG "en_US.UTF-8" \ No newline at end of file diff --git a/tests/data/formatters/out/libvirt-go-xml-module-almalinux-9.json b/tests/data/formatters/out/libvirt-go-xml-module-almalinux-9.json new file mode 100644 index 0000000..81f8114 --- /dev/null +++ b/tests/data/formatters/out/libvirt-go-xml-module-almalinux-9.json @@ -0,0 +1,17 @@ +{ + "ccache": "/usr/bin/ccache", + "cpan_pkgs": [], + "cross_pkgs": [], + "make": "/usr/bin/make", + "ninja": "/usr/bin/ninja", + "packaging_command": "dnf", + "pip3": "/usr/bin/pip3", + "pkgs": [ + "ca-certificates", + "git", + "glibc-langpack-en", + "golang" + ], + "pypi_pkgs": [], + "python": "/usr/bin/python3" +} \ No newline at end of file diff --git a/tests/data/formatters/out/libvirt-go-xml-module-almalinux-9.sh b/tests/data/formatters/out/libvirt-go-xml-module-almalinux-9.sh new file mode 100644 index 0000000..720daa5 --- /dev/null +++ b/tests/data/formatters/out/libvirt-go-xml-module-almalinux-9.sh @@ -0,0 +1,14 @@ +function install_buildenv() { + dnf update -y + dnf install 'dnf-command(config-manager)' -y + dnf config-manager --set-enabled -y crb + dnf install -y epel-release + dnf install -y \ + ca-certificates \ + git \ + glibc-langpack-en \ + golang + rpm -qa | sort > /packages.txt +} + +export LANG="en_US.UTF-8" \ No newline at end of file diff --git a/tests/data/formatters/out/libvirt-go-xml-module-almalinux-9.vars b/tests/data/formatters/out/libvirt-go-xml-module-almalinux-9.vars new file mode 100644 index 0000000..e97254c --- /dev/null +++ b/tests/data/formatters/out/libvirt-go-xml-module-almalinux-9.vars @@ -0,0 +1,10 @@ +CCACHE='/usr/bin/ccache' +CPAN_PKGS='' +CROSS_PKGS='' +MAKE='/usr/bin/make' +NINJA='/usr/bin/ninja' +PACKAGING_COMMAND='dnf' +PIP3='/usr/bin/pip3' +PKGS='ca-certificates git glibc-langpack-en golang' +PYPI_PKGS='' +PYTHON='/usr/bin/python3' \ No newline at end of file diff --git a/tests/data/formatters/out/libvirt-go-xml-module-almalinux-9.yaml b/tests/data/formatters/out/libvirt-go-xml-module-almalinux-9.yaml new file mode 100644 index 0000000..d775525 --- /dev/null +++ b/tests/data/formatters/out/libvirt-go-xml-module-almalinux-9.yaml @@ -0,0 +1,5 @@ +packages: + - ca-certificates + - git + - glibc-langpack-en + - golang 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 = [ -- cgit v1.1