aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorErik Skultety <eskultet@redhat.com>2022-05-31 15:05:22 +0200
committerErik Skultety <eskultet@redhat.com>2022-06-01 08:51:40 +0200
commit561f2e039fc940575d2c52c63eff6f032e99f963 (patch)
tree3a0c91fcdcbba4fe686358fbc5ed7bae50c82351
parent218d0abad75356ee5ce072f1fe3ad2947d7c612e (diff)
downloadlibvirt-ci-561f2e039fc940575d2c52c63eff6f032e99f963.zip
libvirt-ci-561f2e039fc940575d2c52c63eff6f032e99f963.tar.gz
libvirt-ci-561f2e039fc940575d2c52c63eff6f032e99f963.tar.bz2
guests: Introduce AlmaLinux 9
Since it's a community rebuild of RHEL-9 same restriction apply as for CentOS Stream 9. Signed-off-by: Erik Skultety <eskultet@redhat.com>
-rw-r--r--.gitlab-ci.yml5
-rw-r--r--guests/lcitool/lcitool/ansible/group_vars/almalinux-9/main.yml29
-rw-r--r--guests/lcitool/lcitool/ansible/playbooks/build/jobs/defaults.yml2
-rw-r--r--guests/lcitool/lcitool/ansible/playbooks/build/projects/libvirt-dbus.yml1
-rw-r--r--guests/lcitool/lcitool/ansible/playbooks/build/projects/libvirt.yml1
-rw-r--r--guests/lcitool/lcitool/ansible/playbooks/update/tasks/base.yml4
-rw-r--r--guests/lcitool/lcitool/ansible/vars/mappings.yml27
-rw-r--r--guests/lcitool/lcitool/formatters.py4
-rw-r--r--guests/lcitool/tests/data/packages/out/almalinux-9.yml244
9 files changed, 304 insertions, 13 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 680e18e..bde8729 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -173,6 +173,11 @@ x86_64-check-almalinux-8:
variables:
NAME: almalinux-8
+x86_64-check-almalinux-9:
+ extends: .check_container_template
+ variables:
+ NAME: almalinux-9
+
x86_64-check-alpine-314:
extends: .check_container_template
variables:
diff --git a/guests/lcitool/lcitool/ansible/group_vars/almalinux-9/main.yml b/guests/lcitool/lcitool/ansible/group_vars/almalinux-9/main.yml
new file mode 100644
index 0000000..9c0e91f
--- /dev/null
+++ b/guests/lcitool/lcitool/ansible/group_vars/almalinux-9/main.yml
@@ -0,0 +1,29 @@
+---
+os:
+ name: 'AlmaLinux'
+ version: '9'
+
+target: 'almalinux-9'
+
+packaging:
+ format: 'rpm'
+ command: 'dnf'
+
+paths:
+ bash: /bin/bash
+ cc: /usr/bin/gcc
+ ccache: /usr/bin/ccache
+ make: /usr/bin/make
+ ninja: /usr/bin/ninja
+ pip3: /usr/bin/pip3
+ python: /usr/bin/python3
+ sudoers: /etc/sudoers
+
+ansible_python_package: python3
+ansible_python_interpreter: /usr/bin/python3
+
+install:
+ url: https://repo.almalinux.org/almalinux/9/BaseOS/x86_64/os/
+
+containers:
+ base: docker.io/library/almalinux:9
diff --git a/guests/lcitool/lcitool/ansible/playbooks/build/jobs/defaults.yml b/guests/lcitool/lcitool/ansible/playbooks/build/jobs/defaults.yml
index c961b91..16aded9 100644
--- a/guests/lcitool/lcitool/ansible/playbooks/build/jobs/defaults.yml
+++ b/guests/lcitool/lcitool/ansible/playbooks/build/jobs/defaults.yml
@@ -1,6 +1,7 @@
---
all_machines:
- almalinux-8
+ - almalinux-9
- centos-stream-8
- centos-stream-9
- debian-10
@@ -18,6 +19,7 @@ all_machines:
- ubuntu-2204
rpm_machines:
- almalinux-8
+ - almalinux-9
- centos-stream-8
- centos-stream-9
- fedora-35
diff --git a/guests/lcitool/lcitool/ansible/playbooks/build/projects/libvirt-dbus.yml b/guests/lcitool/lcitool/ansible/playbooks/build/projects/libvirt-dbus.yml
index 20346b6..79f81ab 100644
--- a/guests/lcitool/lcitool/ansible/playbooks/build/projects/libvirt-dbus.yml
+++ b/guests/lcitool/lcitool/ansible/playbooks/build/projects/libvirt-dbus.yml
@@ -13,6 +13,7 @@
# (3.5.0 and 2.0.0 respectively) are not compatible.
machines:
- almalinux-8
+ - almalinux-9
- centos-stream-8
- centos-stream-9
- debian-10
diff --git a/guests/lcitool/lcitool/ansible/playbooks/build/projects/libvirt.yml b/guests/lcitool/lcitool/ansible/playbooks/build/projects/libvirt.yml
index 7b6cd7e..1b12044 100644
--- a/guests/lcitool/lcitool/ansible/playbooks/build/projects/libvirt.yml
+++ b/guests/lcitool/lcitool/ansible/playbooks/build/projects/libvirt.yml
@@ -13,6 +13,7 @@
# commands with more arguments than FreeBSD supports
machines:
- almalinux-8
+ - almalinux-9
- centos-stream-8
- centos-stream-9
- debian-10
diff --git a/guests/lcitool/lcitool/ansible/playbooks/update/tasks/base.yml b/guests/lcitool/lcitool/ansible/playbooks/update/tasks/base.yml
index daaa151..9b3a757 100644
--- a/guests/lcitool/lcitool/ansible/playbooks/update/tasks/base.yml
+++ b/guests/lcitool/lcitool/ansible/playbooks/update/tasks/base.yml
@@ -53,8 +53,8 @@
- https://dl.fedoraproject.org/pub/epel/epel-release-latest-9.noarch.rpm
- https://dl.fedoraproject.org/pub/epel/epel-next-release-latest-9.noarch.rpm
when:
- - os.name == 'CentOS'
- - os.version == 'Stream9'
+ - (os.name == 'CentOS' and os.version == 'Stream9') or
+ (os.name == 'AlmaLinux' and os.version == '9')
- name: Enable Advanced Virtualization repository
package:
diff --git a/guests/lcitool/lcitool/ansible/vars/mappings.yml b/guests/lcitool/lcitool/ansible/vars/mappings.yml
index 71ca681..ad06330 100644
--- a/guests/lcitool/lcitool/ansible/vars/mappings.yml
+++ b/guests/lcitool/lcitool/ansible/vars/mappings.yml
@@ -200,7 +200,8 @@ mappings:
rpm: capstone-devel
MacOS: capstone
OpenSUSE:
- # FIXME Drop once EPEL for CentOS Stream 9 adds the package
+ # FIXME Drop once EPEL for AlmaLinux 9 / CentOS Stream 9 adds the package
+ AlmaLinux9:
CentOSStream9:
cross-policy-default: foreign
@@ -211,7 +212,8 @@ mappings:
ccache:
default: ccache
- # FIXME Drop once EPEL for CentOS Stream 9 adds the package
+ # FIXME Drop once EPEL for AlmaLinux 9 / CentOS Stream 9 adds the package
+ AlmaLinux9:
CentOSStream9:
check:
@@ -346,7 +348,8 @@ mappings:
apk: py3-flake8
pkg: py38-flake8
rpm: python3-flake8
- # FIXME Drop once EPEL for CentOS Stream 9 adds the package
+ # FIXME Drop once EPEL for AlmaLinux 9 / CentOS Stream 9 adds the package
+ AlmaLinux9:
CentOSStream9:
flex:
@@ -825,7 +828,8 @@ mappings:
deb: libjemalloc-dev
rpm: jemalloc-devel
MacOS: jemalloc
- # FIXME Drop once EPEL for CentOS Stream 9 adds the package
+ # FIXME Drop once EPEL for AlmaLinux 9 / CentOS Stream 9 adds the package
+ AlmaLinux9:
CentOSStream9:
cross-policy-default: foreign
@@ -858,7 +862,8 @@ mappings:
apk: libnfs-dev
deb: libnfs-dev
rpm: libnfs-devel
- # FIXME Drop once EPEL for CentOS Stream 9 adds the package
+ # FIXME Drop once EPEL for AlmaLinux 9 / CentOS Stream 9 adds the package
+ AlmaLinux9:
CentOSStream9:
cross-policy-default: foreign
@@ -986,7 +991,8 @@ mappings:
apk: libssh2-dev
deb: libssh2-1-dev
rpm: libssh2-devel
- # FIXME Drop once EPEL for CentOS Stream 9 adds the package
+ # FIXME Drop once EPEL for AlmaLinux 9 / CentOS Stream 9 adds the package
+ AlmaLinux9:
CentOSStream9:
cross-mingw32-rpm: mingw32-libssh2
cross-mingw64-rpm: mingw64-libssh2
@@ -1354,7 +1360,8 @@ mappings:
deb: libio-interface-perl
pkg: p5-IO-Interface
rpm: perl-IO-Interface
- # FIXME Drop once EPEL for CentOS Stream 9 adds the package
+ # FIXME Drop once EPEL for AlmaLinux 9 / CentOS Stream 9 adds the package
+ AlmaLinux9:
CentOSStream9:
perl-IO-String:
@@ -1374,7 +1381,8 @@ mappings:
pkg: p5-Net-OpenSSH
rpm: perl-Net-OpenSSH
OpenSUSE:
- # FIXME Drop once EPEL for CentOS Stream 9 adds the package
+ # FIXME Drop once EPEL for AlmaLinux 9 / CentOS Stream 9 adds the package
+ AlmaLinux9:
CentOSStream9:
perl-NetAddr-IP:
@@ -1945,7 +1953,8 @@ mappings:
deb: libvirglrenderer-dev
pkg: virglrenderer
rpm: virglrenderer-devel
- # FIXME Drop once EPEL for CentOS Stream 9 adds the package
+ # FIXME Drop once EPEL for AlmaLinux 9 / CentOS Stream 9 adds the package
+ AlmaLinux9:
CentOSStream9:
cross-policy-default: foreign
diff --git a/guests/lcitool/lcitool/formatters.py b/guests/lcitool/lcitool/formatters.py
index 1068805..daf1fa6 100644
--- a/guests/lcitool/lcitool/formatters.py
+++ b/guests/lcitool/lcitool/formatters.py
@@ -308,7 +308,7 @@ class DockerfileFormatter(Formatter):
commands.extend([
"{nosync}{packaging_command} install 'dnf-command(config-manager)' -y",
])
- if osversion == "Stream9":
+ if osversion in ["9", "Stream9"]:
commands.extend([
"{nosync}{packaging_command} config-manager --set-enabled -y crb",
])
@@ -329,7 +329,7 @@ class DockerfileFormatter(Formatter):
# and are only available through EPEL
if osversion in ["8", "Stream8"]:
epel_pkgs = ["epel-release"]
- elif osversion == "Stream9":
+ elif osversion in ["9", "Stream9"]:
base_url = "https://dl.fedoraproject.org/pub/epel/"
rpm_suffix = "-latest-9.noarch.rpm"
diff --git a/guests/lcitool/tests/data/packages/out/almalinux-9.yml b/guests/lcitool/tests/data/packages/out/almalinux-9.yml
new file mode 100644
index 0000000..b1e2da9
--- /dev/null
+++ b/guests/lcitool/tests/data/packages/out/almalinux-9.yml
@@ -0,0 +1,244 @@
+cpan:
+- IO::Interface
+- LWP::UserAgent
+- Net::OpenSSH
+- TAP::Formatter::HTML
+- TAP::Formatter::JUnit
+- TAP::Harness::Archive
+- accessors
+native:
+- SDL2-devel
+- alsa-lib-devel
+- ant
+- ant-junit
+- audit-libs-devel
+- augeas
+- autoconf
+- automake
+- bash
+- bash-completion
+- bc
+- bison
+- brlapi-devel
+- bzip2
+- bzip2-devel
+- ca-certificates
+- cargo
+- check-devel
+- chrony
+- clang
+- clang-devel
+- clippy
+- cloud-init
+- cloud-utils-growpart
+- cpp
+- cyrus-sasl-devel
+- daxctl-devel
+- dbus-daemon
+- device-mapper-devel
+- device-mapper-multipath-devel
+- diffutils
+- dnsmasq
+- dwarves
+- ebtables
+- findutils
+- firewalld-filesystem
+- flex
+- fuse-devel
+- fuse3
+- fuse3-devel
+- gcc
+- gcc-c++
+- gdb
+- gdk-pixbuf2-devel
+- gettext
+- gettext-devel
+- git
+- glib2-devel
+- glib2-static
+- glibc-devel
+- glibc-langpack-en
+- glibc-static
+- gnutls-devel
+- gnutls-utils
+- gobject-introspection-devel
+- golang
+- grep
+- gtk-doc
+- gtk-update-icon-cache
+- gtk3-devel
+- guestfs-tools
+- gzip
+- hostname
+- hwdata
+- icoutils
+- intltool
+- iproute
+- iproute-tc
+- iptables
+- iscsi-initiator-utils
+- java-11-openjdk-headless
+- jna
+- jq
+- json-glib-devel
+- junit
+- kmod
+- libacl-devel
+- libaio-devel
+- libarchive-devel
+- libasan
+- libattr-devel
+- libblkid-devel
+- libbpf-devel
+- libcap-ng-devel
+- libconfig-devel
+- libcurl-devel
+- libdrm-devel
+- libepoxy-devel
+- libfdt-devel
+- libffi-devel
+- libgcrypt-devel
+- libjpeg-devel
+- libnl3-devel
+- libpcap-devel
+- libpciaccess-devel
+- libpmem-devel
+- libpng-devel
+- librbd-devel
+- libseccomp-devel
+- libselinux-devel
+- libsoup-devel
+- libssh-devel
+- libtasn1-devel
+- libtirpc-devel
+- libtool
+- libubsan
+- libusbx-devel
+- libuuid-devel
+- libvirt-devel
+- libwsman-devel
+- libxml2
+- libxml2-devel
+- libxslt
+- libxslt-devel
+- libzstd-devel
+- llvm
+- lsof
+- lttng-ust-devel
+- lvm2
+- lzo-devel
+- make
+- mesa-libgbm-devel
+- meson
+- nano
+- nbdkit
+- ncurses-devel
+- net-snmp-devel
+- net-tools
+- nettle-devel
+- nfs-utils
+- ninja-build
+- nmap-ncat
+- numactl-devel
+- numad
+- ocaml
+- ocaml-findlib
+- ocamldoc
+- openssh-clients
+- osinfo-db-tools
+- pam-devel
+- parted-devel
+- pcre-static
+- perl-App-cpanminus
+- perl-Archive-Tar
+- perl-CPAN-Changes
+- perl-Digest
+- perl-Digest-MD5
+- perl-ExtUtils-CBuilder
+- perl-File-Slurp
+- perl-IO-Compress-Bzip2
+- perl-IO-String
+- perl-Module-Build
+- perl-Net-SNMP
+- perl-NetAddr-IP
+- perl-Pod-Simple
+- perl-Sub-Uplevel
+- perl-Sys-Hostname
+- perl-Test-Exception
+- perl-Test-Harness
+- perl-Test-Pod
+- perl-Test-Pod-Coverage
+- perl-Test-Simple
+- perl-Time-HiRes
+- perl-XML-Twig
+- perl-XML-Writer
+- perl-XML-XPath
+- perl-YAML
+- perl-base
+- perl-devel
+- perl-generators
+- perl-podlators
+- php-devel
+- pixman-devel
+- pkgconfig
+- polkit
+- pulseaudio-libs-devel
+- python3
+- python3-PyYAML
+- python3-dbus
+- python3-devel
+- python3-docutils
+- python3-gobject
+- python3-libselinux
+- python3-libxml2
+- python3-lxml
+- python3-numpy
+- python3-pip
+- python3-pytest
+- python3-requests
+- python3-setuptools
+- python3-sphinx
+- python3-sphinx_rtd_theme
+- python3-wheel
+- qemu-img
+- qemu-kvm
+- rdma-core-devel
+- readline-devel
+- rpcgen
+- rpm
+- rpm-build
+- ruby-devel
+- rubygem-rake
+- rust
+- sanlock-devel
+- screen
+- scrub
+- sed
+- snappy-devel
+- spice-protocol
+- strace
+- sudo
+- systemd-devel
+- systemtap-sdt-devel
+- tar
+- tcpdump
+- texinfo
+- unzip
+- usbredir-devel
+- util-linux
+- vala
+- valgrind
+- vim-minimal
+- vte291-devel
+- wget
+- which
+- wireshark-devel
+- xfsprogs-devel
+- xz
+- xz-devel
+- yajl-devel
+- zip
+- zlib-devel
+- zlib-static
+pypi:
+- pillow