From e83424319662338f413fd0189abbe0d5ff1e515c Mon Sep 17 00:00:00 2001 From: Sanne Raymaekers Date: Wed, 29 May 2024 15:10:42 +0200 Subject: [PATCH] .gitlab-ci.yml: switch to rhel 8.10 and 9.4 GA --- .gitlab-ci.yml | 97 +++++++++++++++++++++----------------------------- Schutzfile | 84 ++----------------------------------------- 2 files changed, 43 insertions(+), 138 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 44c20289510..1637265ade8 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -79,8 +79,6 @@ init: .RPM_RUNNERS_RHEL: &RPM_RUNNERS_RHEL RUNNER: - - aws/rhel-8.10-nightly-x86_64 - - aws/rhel-8.10-nightly-aarch64 - aws/rhel-9.5-nightly-x86_64 - aws/rhel-9.5-nightly-aarch64 @@ -102,10 +100,10 @@ RPM: - aws/fedora-39-aarch64 - aws/rhel-8.4-ga-x86_64 - aws/rhel-8.4-ga-aarch64 - - aws/rhel-8.9-ga-x86_64 - - aws/rhel-8.9-ga-aarch64 - - aws/rhel-9.3-ga-x86_64 - - aws/rhel-9.3-ga-aarch64 + - aws/rhel-8.10-ga-x86_64 + - aws/rhel-8.10-ga-aarch64 + - aws/rhel-9.4-ga-x86_64 + - aws/rhel-9.4-ga-aarch64 - aws/centos-stream-9-x86_64 - aws/centos-stream-9-aarch64 - <<: *RPM_RUNNERS_RHEL @@ -135,7 +133,7 @@ Container: parallel: matrix: - RUNNER: - - aws/rhel-8.9-ga-x86_64 + - aws/rhel-8.10-ga-x86_64 Packer: stage: test @@ -145,7 +143,7 @@ Packer: script: - tools/ci-build-worker-packer.sh variables: - RUNNER: aws/rhel-9.3-ga-x86_64 + RUNNER: aws/rhel-9.4-ga-x86_64 Prepare-rhel-internal: stage: prepare-rhel-internal @@ -164,7 +162,6 @@ Prepare-rhel-internal: - RUNNER: # NOTE: 1 runner prepares for all arches b/c subsequent jobs download # artifacts from all previous jobs and the last one wins - - aws/rhel-8.10-nightly-x86_64 - aws/rhel-9.5-nightly-x86_64 INTERNAL_NETWORK: ["true"] @@ -186,13 +183,11 @@ Base: - aws/fedora-39-aarch64 - aws/rhel-8.4-ga-x86_64 - aws/rhel-8.4-ga-aarch64 - - aws/rhel-8.9-ga-x86_64 - - aws/rhel-8.9-ga-aarch64 - - aws/rhel-9.3-ga-x86_64 - - aws/rhel-9.3-ga-aarch64 + - aws/rhel-8.10-ga-x86_64 + - aws/rhel-8.10-ga-aarch64 + - aws/rhel-9.4-ga-x86_64 + - aws/rhel-9.4-ga-aarch64 - RUNNER: - - aws/rhel-8.10-nightly-x86_64 - - aws/rhel-8.10-nightly-aarch64 - aws/rhel-9.5-nightly-x86_64 - aws/rhel-9.5-nightly-aarch64 - aws/centos-stream-9-x86_64 @@ -218,12 +213,10 @@ Base: - RUNNER: - aws/rhel-8.4-ga-x86_64 - aws/rhel-8.4-ga-aarch64 - - aws/rhel-8.9-ga-x86_64 - - aws/rhel-8.9-ga-aarch64 - - aws/rhel-9.3-ga-x86_64 - - aws/rhel-9.3-ga-aarch64 - - aws/rhel-8.10-nightly-x86_64 - - aws/rhel-8.10-nightly-aarch64 + - aws/rhel-8.10-ga-x86_64 + - aws/rhel-8.10-ga-aarch64 + - aws/rhel-9.4-ga-x86_64 + - aws/rhel-9.4-ga-aarch64 - aws/rhel-9.5-nightly-x86_64 - aws/rhel-9.5-nightly-aarch64 - aws/centos-stream-9-x86_64 @@ -268,8 +261,8 @@ regression-old-worker-new-composer: parallel: matrix: - RUNNER: - - aws/rhel-8.9-ga-x86_64 - - aws/rhel-9.3-ga-x86_64 + - aws/rhel-8.10-ga-x86_64 + - aws/rhel-9.4-ga-x86_64 INTERNAL_NETWORK: ["true"] extends: .regression variables: @@ -307,8 +300,6 @@ Image Tests: - RUNNER: - aws/rhel-8.4-ga-x86_64 - aws/rhel-8.4-ga-aarch64 - - aws/rhel-8.10-nightly-x86_64 - - aws/rhel-8.10-nightly-aarch64 - aws/rhel-9.5-nightly-x86_64 - aws/rhel-9.5-nightly-aarch64 INTERNAL_NETWORK: ["true"] @@ -336,10 +327,8 @@ Trigger-rhel-edge-ci: .rhel_runners: &rhel_runners RUNNER: - aws/rhel-8.4-ga-x86_64 - - aws/rhel-8.9-ga-x86_64 - - aws/rhel-9.3-ga-x86_64 - - aws/rhel-8.10-nightly-x86_64 - - aws/rhel-8.10-nightly-aarch64 + - aws/rhel-8.10-ga-x86_64 + - aws/rhel-9.4-ga-x86_64 - aws/rhel-9.5-nightly-x86_64 - aws/rhel-9.5-nightly-aarch64 - aws/centos-stream-9-x86_64 @@ -380,20 +369,20 @@ koji.sh (cloud upload): parallel: matrix: - RUNNER: - - aws/rhel-8.9-ga-x86_64 - - aws/rhel-9.3-ga-x86_64 + - aws/rhel-8.10-ga-x86_64 + - aws/rhel-9.4-ga-x86_64 INTERNAL_NETWORK: ["true"] CLOUD_TARGET: aws IMAGE_TYPE: aws-rhui - RUNNER: - - aws/rhel-8.9-ga-x86_64 - - aws/rhel-9.3-ga-x86_64 + - aws/rhel-8.10-ga-x86_64 + - aws/rhel-9.4-ga-x86_64 INTERNAL_NETWORK: ["true"] CLOUD_TARGET: azure IMAGE_TYPE: azure-rhui - RUNNER: - - aws/rhel-8.9-ga-x86_64 - - aws/rhel-9.3-ga-x86_64 + - aws/rhel-8.10-ga-x86_64 + - aws/rhel-9.4-ga-x86_64 INTERNAL_NETWORK: ["true"] CLOUD_TARGET: gcp IMAGE_TYPE: gcp-rhui @@ -409,8 +398,8 @@ koji.sh (cloudapi): matrix: - *fedora_runners - RUNNER: - - aws/rhel-8.9-ga-x86_64 - - aws/rhel-9.3-ga-x86_64 + - aws/rhel-8.10-ga-x86_64 + - aws/rhel-9.4-ga-x86_64 INTERNAL_NETWORK: ["true"] aws.sh: @@ -531,9 +520,8 @@ API: matrix: - <<: *API_TESTS RUNNER: - - aws/rhel-8.9-ga-x86_64 - - aws/rhel-9.3-ga-x86_64 - - aws/rhel-8.10-nightly-x86_64 + - aws/rhel-8.10-ga-x86_64 + - aws/rhel-9.4-ga-x86_64 - aws/rhel-9.5-nightly-x86_64 INTERNAL_NETWORK: ["true"] - IMAGE_TYPE: ["iot-commit"] @@ -546,8 +534,8 @@ API: - aws/fedora-39-aarch64 - IMAGE_TYPE: ["aws"] RUNNER: - - aws/rhel-8.9-ga-aarch64 - - aws/rhel-9.3-ga-aarch64 + - aws/rhel-8.10-ga-aarch64 + - aws/rhel-9.4-ga-aarch64 INTERNAL_NETWORK: ["true"] API-module-hotfixes: @@ -565,14 +553,14 @@ API-module-hotfixes: - IMAGE_TYPE: - aws RUNNER: - - aws/rhel-8.9-ga-x86_64 - - aws/rhel-8.9-ga-aarch64 + - aws/rhel-8.10-ga-x86_64 + - aws/rhel-8.10-ga-aarch64 INTERNAL_NETWORK: ["true"] TEST_MODULE_HOTFIXES: [1] - IMAGE_TYPE: - vsphere RUNNER: - - aws/rhel-8.9-ga-x86_64 + - aws/rhel-8.10-ga-x86_64 INTERNAL_NETWORK: ["true"] TEST_MODULE_HOTFIXES: [1] @@ -591,9 +579,8 @@ API-module-hotfixes: - rhos-01/fedora-38-x86_64 # - rhos-01/fedora-39-x86_64 - RUNNER: - - gcp/rhel-8.9-ga-x86_64 - - gcp/rhel-9.3-ga-x86_64 - - gcp/rhel-8.10-nightly-x86_64 + - gcp/rhel-8.10-ga-x86_64 + - gcp/rhel-9.4-ga-x86_64 - gcp/rhel-9.5-nightly-x86_64 - gcp/centos-stream-9-x86_64 INTERNAL_NETWORK: ["true"] @@ -615,8 +602,8 @@ ubi-wsl.sh: parallel: matrix: - RUNNER: - - aws/rhel-8.9-ga-x86_64 - - aws/rhel-9.3-ga-x86_64 + - aws/rhel-8.10-ga-x86_64 + - aws/rhel-9.4-ga-x86_64 INTERNAL_NETWORK: "true" weldr-distro-dot-notation+aliases: @@ -631,7 +618,7 @@ weldr-distro-dot-notation+aliases: parallel: matrix: - RUNNER: - - aws/rhel-8.8-ga-x86_64 + - aws/rhel-8.10-ga-x86_64 - aws/rhel-9.5-nightly-x86_64 INTERNAL_NETWORK: ["true"] @@ -671,7 +658,7 @@ RHEL 9 on 8: - schutzbot/deploy.sh - /usr/libexec/tests/osbuild-composer/koji.sh variables: - RUNNER: aws/rhel-8.9-ga-x86_64 + RUNNER: aws/rhel-8.10-ga-x86_64 INTERNAL_NETWORK: "true" DISTRO_CODE: rhel-91 @@ -684,8 +671,7 @@ Multi-tenancy: - schutzbot/deploy.sh - /usr/libexec/tests/osbuild-composer/multi-tenancy.sh variables: - # only 8.7 GA b/c the Image Builder service runs on RHEL 8 - RUNNER: aws/rhel-8.9-ga-x86_64 + RUNNER: aws/rhel-8.10-ga-x86_64 INTERNAL_NETWORK: "true" Upgrade: @@ -730,7 +716,6 @@ Installer: parallel: matrix: - RUNNER: - - rhos-01/rhel-8.10-nightly-x86_64 - rhos-01/rhel-9.5-nightly-x86_64 - rhos-01/centos-stream-9-x86_64 @@ -762,8 +747,6 @@ ContainerEmbedding: - INTERNAL_NETWORK: "true" RUNNER: - aws/centos-stream-9-x86_64 - - aws/rhel-8.10-nightly-x86_64 - - aws/rhel-8.10-nightly-aarch64 - aws/rhel-9.5-nightly-x86_64 - aws/rhel-9.5-nightly-aarch64 diff --git a/Schutzfile b/Schutzfile index 5f11e18ad9a..6b7e247b404 100644 --- a/Schutzfile +++ b/Schutzfile @@ -171,46 +171,7 @@ "osbuild": { "commit": "4dbf8e2d593b769bf4797a18a9c6462696990af3" } - }, - "repos": [ - { - "file": "/etc/yum.repos.d/rhel8internal.repo", - "x86_64": [ - { - "title": "RHEL-8-RPMREPO-NIGHTLY-BaseOS", - "name": "baseos", - "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.10-20240514" - }, - { - "title": "RHEL-8-RPMREPO-NIGHTLY-AppStream", - "name": "appstream", - "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-n8.10-20240514" - }, - { - "title": "RHEL-8-RPMREPO-NIGHTLY-CRB", - "name": "crb", - "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-crb-n8.10-20240514" - } - ], - "aarch64": [ - { - "title": "RHEL-8-RPMREPO-NIGHTLY-BaseOS", - "name": "baseos", - "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-aarch64-baseos-n8.10-20240514" - }, - { - "title": "RHEL-8-RPMREPO-NIGHTLY-AppStream", - "name": "appstream", - "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-aarch64-appstream-n8.10-20240514" - }, - { - "title": "RHEL-8-RPMREPO-NIGHTLY-CRB", - "name": "crb", - "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-aarch64-crb-n8.10-20240514" - } - ] - } - ] + } }, "rhel-9.2": { "dependencies": { @@ -231,46 +192,7 @@ "osbuild": { "commit": "4dbf8e2d593b769bf4797a18a9c6462696990af3" } - }, - "repos": [ - { - "file": "/etc/yum.repos.d/rhel9internal.repo", - "x86_64": [ - { - "title": "RHEL-9-RPMREPO-NIGHTLY-BaseOS", - "name": "baseos", - "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el9/el9-x86_64-baseos-n9.4-20240514" - }, - { - "title": "RHEL-9-RPMREPO-NIGHTLY-AppStream", - "name": "appstream", - "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el9/el9-x86_64-appstream-n9.4-20240514" - }, - { - "title": "RHEL-9-RPMREPO-NIGHTLY-CRB", - "name": "crb", - "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el9/el9-x86_64-crb-n9.4-20240514" - } - ], - "aarch64": [ - { - "title": "RHEL-9-RPMREPO-NIGHTLY-BaseOS", - "name": "baseos", - "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el9/el9-aarch64-baseos-n9.4-20240514" - }, - { - "title": "RHEL-9-RPMREPO-NIGHTLY-AppStream", - "name": "appstream", - "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el9/el9-aarch64-appstream-n9.4-20240514" - }, - { - "title": "RHEL-9-RPMREPO-NIGHTLY-CRB", - "name": "crb", - "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el9/el9-aarch64-crb-n9.4-20240514" - } - ] - } - ] + } }, "rhel-9.5": { "dependencies": { @@ -371,4 +293,4 @@ } ] } -} \ No newline at end of file +}