From c7b1975a76301b639dd2fa6e2a92d8d1c771bf00 Mon Sep 17 00:00:00 2001 From: Trey Dockendorf Date: Mon, 11 Nov 2024 08:41:05 -0500 Subject: [PATCH] Add ubuntu-24.04 and amzn2023 aarch64 builds back to matrix --- .gitlab-ci.yml | 20 ++++++-------------- 1 file changed, 6 insertions(+), 14 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index a64aa0300..8b41966e8 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -29,15 +29,11 @@ build-nightly: OOD_PACKAGING_GPG_PRIVATE_KEY: /systems/osc_certs/gpg/ondemand/ondemand.sec - OOD_PACKAGING_DIST: [el9] OOD_PACKAGING_ARCH: [x86_64, aarch64, ppc64le] - # Ubuntu doesn't have way to get NodeJS 14+ on ppc64le - - OOD_PACKAGING_DIST: [ubuntu-20.04, ubuntu-22.04, debian-12] + # Ubuntu and Debian don't have way to get NodeJS 20+ on ppc64le + - OOD_PACKAGING_DIST: [ubuntu-20.04, ubuntu-22.04, ubuntu-24.04, debian-12] OOD_PACKAGING_ARCH: [x86_64, aarch64] - # Ubuntu 24.04 on aarch64 is slow and will time out - - OOD_PACKAGING_DIST: [ubuntu-24.04] - OOD_PACKAGING_ARCH: [x86_64] - # Amazon 2023 on aarch64 is slow and will time out - OOD_PACKAGING_DIST: [amzn2023] - OOD_PACKAGING_ARCH: [x86_64] + OOD_PACKAGING_ARCH: [x86_64, aarch64] timeout: 4h artifacts: paths: @@ -62,15 +58,11 @@ build: OOD_PACKAGING_GPG_PRIVATE_KEY: /systems/osc_certs/gpg/ondemand/ondemand.sec - OOD_PACKAGING_DIST: [el9] OOD_PACKAGING_ARCH: [x86_64, aarch64, ppc64le] - # Ubuntu doesn't have way to get NodeJS 14+ on ppc64le - - OOD_PACKAGING_DIST: [ubuntu-20.04, ubuntu-22.04, debian-12] + # Ubuntu and Debian don't have way to get NodeJS 20+ on ppc64le + - OOD_PACKAGING_DIST: [ubuntu-20.04, ubuntu-22.04, ubuntu-24.04, debian-12] OOD_PACKAGING_ARCH: [x86_64, aarch64] - # Ubuntu 24.04 on aarch64 is slow and will time out - - OOD_PACKAGING_DIST: [ubuntu-24.04] - OOD_PACKAGING_ARCH: [x86_64] - # Amazon 2023 on aarch64 is slow and will time out - OOD_PACKAGING_DIST: [amzn2023] - OOD_PACKAGING_ARCH: [x86_64] + OOD_PACKAGING_ARCH: [x86_64, aarch64] timeout: 4h artifacts: paths: