Replace Oracle Linux Docker images with AlmaLinux ones

To be consistent with the replacing of Oracle Linux QCOW2 images with
AlmaLinux AWS AMIs, also replace Docker images.

(cherry picked from commit 63947a2062)
This commit is contained in:
Michal Nowak 2025-04-30 17:34:13 +02:00
parent 35ceab95de
commit 68acd1136b
No known key found for this signature in database
2 changed files with 25 additions and 25 deletions

View file

@ -90,14 +90,14 @@ stages:
image: "$CI_REGISTRY_IMAGE:alpine-3.20-amd64"
<<: *linux_amd64
# Oracle Linux
# AlmaLinux
.oraclelinux-8-amd64: &oraclelinux_8_amd64_image
image: "$CI_REGISTRY_IMAGE:oraclelinux-8-amd64"
.almalinux-8-amd64: &almalinux_8_amd64_image
image: "$CI_REGISTRY_IMAGE:almalinux-8-amd64"
<<: *linux_amd64
.oraclelinux-9-amd64: &oraclelinux_9_amd64_image
image: "$CI_REGISTRY_IMAGE:oraclelinux-9-amd64"
.almalinux-9-amd64: &almalinux_9_amd64_image
image: "$CI_REGISTRY_IMAGE:almalinux-9-amd64"
<<: *linux_amd64
# Debian
@ -524,52 +524,52 @@ unit:gcc:alpine3.20:amd64:
- job: gcc:alpine3.20:amd64
artifacts: true
# Jobs for regular GCC builds on Oracle Linux 8 (amd64)
# Jobs for regular GCC builds on Alma Linux 8 (amd64)
gcc:oraclelinux8:amd64:
gcc:almalinux8:amd64:
variables:
CC: gcc
CFLAGS: "${CFLAGS_COMMON}"
EXTRA_CONFIGURE: "--enable-buffer-useinline --with-libidn2"
<<: *oraclelinux_8_amd64_image
<<: *almalinux_8_amd64_image
<<: *build_job
system:gcc:oraclelinux8:amd64:
<<: *oraclelinux_8_amd64_image
system:gcc:almalinux8:amd64:
<<: *almalinux_8_amd64_image
<<: *system_test_job
needs:
- job: gcc:oraclelinux8:amd64
- job: gcc:almalinux8:amd64
artifacts: true
unit:gcc:oraclelinux8:amd64:
<<: *oraclelinux_8_amd64_image
unit:gcc:almalinux8:amd64:
<<: *almalinux_8_amd64_image
<<: *unit_test_job
needs:
- job: gcc:oraclelinux8:amd64
- job: gcc:almalinux8:amd64
artifacts: true
# Jobs for regular GCC builds on Oracle Linux 9 (amd64)
# Jobs for regular GCC builds on Alma Linux 9 (amd64)
gcc:oraclelinux9:amd64:
gcc:almalinux9:amd64:
variables:
CC: gcc
CFLAGS: "${CFLAGS_COMMON}"
EXTRA_CONFIGURE: "--with-libidn2"
<<: *oraclelinux_9_amd64_image
<<: *almalinux_9_amd64_image
<<: *build_job
system:gcc:oraclelinux9:amd64:
<<: *oraclelinux_9_amd64_image
system:gcc:almalinux9:amd64:
<<: *almalinux_9_amd64_image
<<: *system_test_job
needs:
- job: gcc:oraclelinux9:amd64
- job: gcc:almalinux9:amd64
artifacts: true
unit:gcc:oraclelinux9:amd64:
<<: *oraclelinux_9_amd64_image
unit:gcc:almalinux9:amd64:
<<: *almalinux_9_amd64_image
<<: *unit_test_job
needs:
- job: gcc:oraclelinux9:amd64
- job: gcc:almalinux9:amd64
artifacts: true
gcc:tarball:nosphinx:
@ -578,7 +578,7 @@ gcc:tarball:nosphinx:
CFLAGS: "${CFLAGS_COMMON}"
EXTRA_CONFIGURE: "--with-libidn2 --disable-developer"
RUN_MAKE_INSTALL: 1
<<: *oraclelinux_9_amd64_image
<<: *almalinux_9_amd64_image
<<: *build_job
before_script:
- (! command -v sphinx-build >/dev/null)

View file

@ -48,7 +48,7 @@ following systems:
- Debian 11, 12
- Ubuntu LTS 20.04, 22.04, 24.04
- Fedora 40
- Red Hat Enterprise Linux / CentOS / Oracle Linux 8, 9
- Red Hat Enterprise Linux / CentOS / AlmaLinux 8, 9
- FreeBSD 13.3, 14.0
- Alpine Linux 3.20