From 38306a2f4bff90caf640425c364bfaf794501fff Mon Sep 17 00:00:00 2001 From: Michal Nasiadka Date: 2025年9月10日 08:58:34 +0200 Subject: [PATCH] almalinux-container: Add support for building 10 Add functests for both Alma and Rocky 9/10 Adding x86-64-v2 based Zuul job to ensure it works Change-Id: I95ef6d41f1e78a439c29648d366a3472098092bd Signed-off-by: Michal Nasiadka --- .zuul.d/jobs.yaml | 20 +++++++++++++++++++ .zuul.d/project.yaml | 2 ++ .../almalinux-container/containerfiles/10 | 14 +++++++++++++ .../10-01-almalinux-distro-name.bash | 2 +- .../README.rst | 1 + .../element-deps | 2 ++ .../environment.d/09-set-distro.sh | 1 + .../almalinux-10-build-succeeds/README.rst | 1 + .../almalinux-10-build-succeeds/element-deps | 2 ++ .../environment.d/09-set-distro.sh | 1 + .../almalinux-9-build-succeeds/README.rst | 1 + .../almalinux-9-build-succeeds/element-deps | 2 ++ .../environment.d/09-set-distro.bash | 1 + .../elements/dhcp-all-interfaces/pkg-map | 6 ++++++ .../rocky-10-build-succeeds/README.rst | 1 + .../rocky-10-build-succeeds/element-deps | 2 ++ .../environment.d/09-set-distro.bash | 1 + .../rocky-9-build-succeeds/README.rst | 1 + .../rocky-9-build-succeeds/element-deps | 2 ++ .../environment.d/09-set-distro.bash | 1 + .../elements/simple-init/pkg-map | 15 +++++++++----- 21 files changed, 73 insertions(+), 6 deletions(-) create mode 100644 diskimage_builder/elements/almalinux-container/containerfiles/10 create mode 100644 diskimage_builder/elements/almalinux-container/test-elements/almalinux-10-aarch64-build-succeeds/README.rst create mode 100644 diskimage_builder/elements/almalinux-container/test-elements/almalinux-10-aarch64-build-succeeds/element-deps create mode 100644 diskimage_builder/elements/almalinux-container/test-elements/almalinux-10-aarch64-build-succeeds/environment.d/09-set-distro.sh create mode 100644 diskimage_builder/elements/almalinux-container/test-elements/almalinux-10-build-succeeds/README.rst create mode 100644 diskimage_builder/elements/almalinux-container/test-elements/almalinux-10-build-succeeds/element-deps create mode 100644 diskimage_builder/elements/almalinux-container/test-elements/almalinux-10-build-succeeds/environment.d/09-set-distro.sh create mode 100644 diskimage_builder/elements/almalinux-container/test-elements/almalinux-9-build-succeeds/README.rst create mode 100644 diskimage_builder/elements/almalinux-container/test-elements/almalinux-9-build-succeeds/element-deps create mode 100644 diskimage_builder/elements/almalinux-container/test-elements/almalinux-9-build-succeeds/environment.d/09-set-distro.bash create mode 100644 diskimage_builder/elements/rocky-container/test-elements/rocky-10-build-succeeds/README.rst create mode 100644 diskimage_builder/elements/rocky-container/test-elements/rocky-10-build-succeeds/element-deps create mode 100644 diskimage_builder/elements/rocky-container/test-elements/rocky-10-build-succeeds/environment.d/09-set-distro.bash create mode 100644 diskimage_builder/elements/rocky-container/test-elements/rocky-9-build-succeeds/README.rst create mode 100644 diskimage_builder/elements/rocky-container/test-elements/rocky-9-build-succeeds/element-deps create mode 100644 diskimage_builder/elements/rocky-container/test-elements/rocky-9-build-succeeds/environment.d/09-set-distro.bash diff --git a/.zuul.d/jobs.yaml b/.zuul.d/jobs.yaml index 0d40fe5c1..c943975e1 100644 --- a/.zuul.d/jobs.yaml +++ b/.zuul.d/jobs.yaml @@ -30,6 +30,11 @@ # Image based tests - centos/9-stream-build-succeeds - centos/10-stream-build-succeeds + # Containerfile based tests + - almalinux-container/almalinux-9-build-succeeds + - almalinux-container/almalinux-10-build-succeeds + - rocky-container/rocky-9-build-succeeds + - rocky-container/rocky-10-build-succeeds # NOTE(rpittau) Fedora 37 is EOL, disalbing this until we move to # Fedora 39 or more recent. #- fedora/build-succeeds @@ -66,6 +71,7 @@ vars: dib_functests: - almalinux-container/almalinux-9-aarch64-build-succeeds + - almalinux-container/almalinux-10-aarch64-build-succeeds - centos-minimal/9-stream-aarch64-build-succeeds - centos-minimal/10-stream-aarch64-build-succeeds # Disabled until it gets updated to match the version being mirrored @@ -156,6 +162,20 @@ base_element: almalinux-container release: '9' +- job: + name: dib-devstack-functional-openstack-almalinux-10-v2-containerfile-src + description: | + Test building and booting a AlmaLinux image from a + containerfile with devstack and OpenStack (using released + libraries) + parent: dib-devstack-functional-src-base + vars: + diskimage: + base_element: almalinux-container + env-vars: + DIB_CONTAINERFILE_BUILDOPTS: "--platform linux/amd64/v2" + release: '10' + - job: name: dib-devstack-functional-openstack-centos-8-stream-src description: | diff --git a/.zuul.d/project.yaml b/.zuul.d/project.yaml index 702809307..545c3e787 100644 --- a/.zuul.d/project.yaml +++ b/.zuul.d/project.yaml @@ -37,6 +37,8 @@ voting: false - dib-devstack-functional-openstack-almalinux-9-containerfile-src: voting: false + - dib-devstack-functional-openstack-almalinux-10-v2-containerfile-src: + voting: false - dib-devstack-functional-openstack-centos-9-stream-src - dib-devstack-functional-openstack-centos-10-stream-src: voting: false diff --git a/diskimage_builder/elements/almalinux-container/containerfiles/10 b/diskimage_builder/elements/almalinux-container/containerfiles/10 new file mode 100644 index 000000000..31a4478d2 --- /dev/null +++ b/diskimage_builder/elements/almalinux-container/containerfiles/10 @@ -0,0 +1,14 @@ +FROM quay.io/almalinuxorg/almalinux:10 + +RUN dnf group install -y 'Minimal Install' --allowerasing && \ + dnf install -y findutils util-linux sudo python3 NetworkManager \ + curl libcurl --allowerasing + +RUN systemctl unmask console-getty.service dev-hugepages.mount \ + getty.target sys-fs-fuse-connections.mount systemd-logind.service \ + systemd-remount-fs.service + +# /etc/machine-id needs to be populated for /bin/kernel-install to +# correctly copy kernels into /boot. We will clear this out in the +# final image. +RUN systemd-machine-id-setup \ No newline at end of file diff --git a/diskimage_builder/elements/almalinux-container/environment.d/10-01-almalinux-distro-name.bash b/diskimage_builder/elements/almalinux-container/environment.d/10-01-almalinux-distro-name.bash index 76e0da05c..5ee417d7d 100644 --- a/diskimage_builder/elements/almalinux-container/environment.d/10-01-almalinux-distro-name.bash +++ b/diskimage_builder/elements/almalinux-container/environment.d/10-01-almalinux-distro-name.bash @@ -1,4 +1,4 @@ export DISTRO_NAME=almalinux -export DIB_RELEASE=${DIB_RELEASE:-9} # always the most recent major +export DIB_RELEASE=${DIB_RELEASE:-10} # always the most recent major export EFI_BOOT_DIR="EFI/almalinux" export DIB_YUM_MINIMAL_CREATE_INTERFACES=0 diff --git a/diskimage_builder/elements/almalinux-container/test-elements/almalinux-10-aarch64-build-succeeds/README.rst b/diskimage_builder/elements/almalinux-container/test-elements/almalinux-10-aarch64-build-succeeds/README.rst new file mode 100644 index 000000000..7df2e7374 --- /dev/null +++ b/diskimage_builder/elements/almalinux-container/test-elements/almalinux-10-aarch64-build-succeeds/README.rst @@ -0,0 +1 @@ +Verify a AlmaLinux 10 aarch64 image diff --git a/diskimage_builder/elements/almalinux-container/test-elements/almalinux-10-aarch64-build-succeeds/element-deps b/diskimage_builder/elements/almalinux-container/test-elements/almalinux-10-aarch64-build-succeeds/element-deps new file mode 100644 index 000000000..9c315bfd9 --- /dev/null +++ b/diskimage_builder/elements/almalinux-container/test-elements/almalinux-10-aarch64-build-succeeds/element-deps @@ -0,0 +1,2 @@ +block-device-efi +vm \ No newline at end of file diff --git a/diskimage_builder/elements/almalinux-container/test-elements/almalinux-10-aarch64-build-succeeds/environment.d/09-set-distro.sh b/diskimage_builder/elements/almalinux-container/test-elements/almalinux-10-aarch64-build-succeeds/environment.d/09-set-distro.sh new file mode 100644 index 000000000..d18836755 --- /dev/null +++ b/diskimage_builder/elements/almalinux-container/test-elements/almalinux-10-aarch64-build-succeeds/environment.d/09-set-distro.sh @@ -0,0 +1 @@ +export DIB_RELEASE='10' \ No newline at end of file diff --git a/diskimage_builder/elements/almalinux-container/test-elements/almalinux-10-build-succeeds/README.rst b/diskimage_builder/elements/almalinux-container/test-elements/almalinux-10-build-succeeds/README.rst new file mode 100644 index 000000000..7df2e7374 --- /dev/null +++ b/diskimage_builder/elements/almalinux-container/test-elements/almalinux-10-build-succeeds/README.rst @@ -0,0 +1 @@ +Verify a AlmaLinux 10 aarch64 image diff --git a/diskimage_builder/elements/almalinux-container/test-elements/almalinux-10-build-succeeds/element-deps b/diskimage_builder/elements/almalinux-container/test-elements/almalinux-10-build-succeeds/element-deps new file mode 100644 index 000000000..9c315bfd9 --- /dev/null +++ b/diskimage_builder/elements/almalinux-container/test-elements/almalinux-10-build-succeeds/element-deps @@ -0,0 +1,2 @@ +block-device-efi +vm \ No newline at end of file diff --git a/diskimage_builder/elements/almalinux-container/test-elements/almalinux-10-build-succeeds/environment.d/09-set-distro.sh b/diskimage_builder/elements/almalinux-container/test-elements/almalinux-10-build-succeeds/environment.d/09-set-distro.sh new file mode 100644 index 000000000..d18836755 --- /dev/null +++ b/diskimage_builder/elements/almalinux-container/test-elements/almalinux-10-build-succeeds/environment.d/09-set-distro.sh @@ -0,0 +1 @@ +export DIB_RELEASE='10' \ No newline at end of file diff --git a/diskimage_builder/elements/almalinux-container/test-elements/almalinux-9-build-succeeds/README.rst b/diskimage_builder/elements/almalinux-container/test-elements/almalinux-9-build-succeeds/README.rst new file mode 100644 index 000000000..3f7147904 --- /dev/null +++ b/diskimage_builder/elements/almalinux-container/test-elements/almalinux-9-build-succeeds/README.rst @@ -0,0 +1 @@ +Verify a AlmaLinux 9 image diff --git a/diskimage_builder/elements/almalinux-container/test-elements/almalinux-9-build-succeeds/element-deps b/diskimage_builder/elements/almalinux-container/test-elements/almalinux-9-build-succeeds/element-deps new file mode 100644 index 000000000..6374231dd --- /dev/null +++ b/diskimage_builder/elements/almalinux-container/test-elements/almalinux-9-build-succeeds/element-deps @@ -0,0 +1,2 @@ +block-device-efi +vm diff --git a/diskimage_builder/elements/almalinux-container/test-elements/almalinux-9-build-succeeds/environment.d/09-set-distro.bash b/diskimage_builder/elements/almalinux-container/test-elements/almalinux-9-build-succeeds/environment.d/09-set-distro.bash new file mode 100644 index 000000000..65c6e4ede --- /dev/null +++ b/diskimage_builder/elements/almalinux-container/test-elements/almalinux-9-build-succeeds/environment.d/09-set-distro.bash @@ -0,0 +1 @@ +export DIB_RELEASE='9' diff --git a/diskimage_builder/elements/dhcp-all-interfaces/pkg-map b/diskimage_builder/elements/dhcp-all-interfaces/pkg-map index ce1195104..0c00e675e 100644 --- a/diskimage_builder/elements/dhcp-all-interfaces/pkg-map +++ b/diskimage_builder/elements/dhcp-all-interfaces/pkg-map @@ -1,5 +1,11 @@ { "release": { + "almalinux": { + "10": { + "dhcp-client": "dhcpcd", + "ifupdown": "" + } + }, "centos": { "10-stream": { "dhcp-client": "dhcpcd", diff --git a/diskimage_builder/elements/rocky-container/test-elements/rocky-10-build-succeeds/README.rst b/diskimage_builder/elements/rocky-container/test-elements/rocky-10-build-succeeds/README.rst new file mode 100644 index 000000000..8c516a5fd --- /dev/null +++ b/diskimage_builder/elements/rocky-container/test-elements/rocky-10-build-succeeds/README.rst @@ -0,0 +1 @@ +Verify a Rocky 10 image diff --git a/diskimage_builder/elements/rocky-container/test-elements/rocky-10-build-succeeds/element-deps b/diskimage_builder/elements/rocky-container/test-elements/rocky-10-build-succeeds/element-deps new file mode 100644 index 000000000..6374231dd --- /dev/null +++ b/diskimage_builder/elements/rocky-container/test-elements/rocky-10-build-succeeds/element-deps @@ -0,0 +1,2 @@ +block-device-efi +vm diff --git a/diskimage_builder/elements/rocky-container/test-elements/rocky-10-build-succeeds/environment.d/09-set-distro.bash b/diskimage_builder/elements/rocky-container/test-elements/rocky-10-build-succeeds/environment.d/09-set-distro.bash new file mode 100644 index 000000000..bd613d583 --- /dev/null +++ b/diskimage_builder/elements/rocky-container/test-elements/rocky-10-build-succeeds/environment.d/09-set-distro.bash @@ -0,0 +1 @@ +export DIB_RELEASE='10' diff --git a/diskimage_builder/elements/rocky-container/test-elements/rocky-9-build-succeeds/README.rst b/diskimage_builder/elements/rocky-container/test-elements/rocky-9-build-succeeds/README.rst new file mode 100644 index 000000000..9e1b1ef55 --- /dev/null +++ b/diskimage_builder/elements/rocky-container/test-elements/rocky-9-build-succeeds/README.rst @@ -0,0 +1 @@ +Verify a Rocky 9 image diff --git a/diskimage_builder/elements/rocky-container/test-elements/rocky-9-build-succeeds/element-deps b/diskimage_builder/elements/rocky-container/test-elements/rocky-9-build-succeeds/element-deps new file mode 100644 index 000000000..6374231dd --- /dev/null +++ b/diskimage_builder/elements/rocky-container/test-elements/rocky-9-build-succeeds/element-deps @@ -0,0 +1,2 @@ +block-device-efi +vm diff --git a/diskimage_builder/elements/rocky-container/test-elements/rocky-9-build-succeeds/environment.d/09-set-distro.bash b/diskimage_builder/elements/rocky-container/test-elements/rocky-9-build-succeeds/environment.d/09-set-distro.bash new file mode 100644 index 000000000..65c6e4ede --- /dev/null +++ b/diskimage_builder/elements/rocky-container/test-elements/rocky-9-build-succeeds/environment.d/09-set-distro.bash @@ -0,0 +1 @@ +export DIB_RELEASE='9' diff --git a/diskimage_builder/elements/simple-init/pkg-map b/diskimage_builder/elements/simple-init/pkg-map index 1d0e44bec..517b105e6 100644 --- a/diskimage_builder/elements/simple-init/pkg-map +++ b/diskimage_builder/elements/simple-init/pkg-map @@ -25,6 +25,16 @@ } }, "release": { + "almalinux": { + "10": { + "dhcp-client": "dhcpcd" + } + }, + "centos": { + "10-stream": { + "dhcp-client": "dhcpcd" + } + }, "fedora": { "36": { "NetworkManager-initscripts-ifcfg-rh": "NetworkManager-initscripts-ifcfg-rh" @@ -33,11 +43,6 @@ "NetworkManager-initscripts-ifcfg-rh": "NetworkManager-initscripts-ifcfg-rh" } }, - "centos": { - "10-stream": { - "dhcp-client": "dhcpcd" - } - }, "rocky": { "10": { "dhcp-client": "dhcpcd"

AltStyle によって変換されたページ (->オリジナル) /