From 4bee7cffb93f7dffdab0b2b646ae590772b786aa Mon Sep 17 00:00:00 2001 From: Alexander Todorov Date: Fri, 3 May 2024 13:26:51 +0300 Subject: [PATCH] Replace 9.4 with 9.5 runners --- .gitlab-ci.yml | 46 +++++++++++++++++++++++----------------------- 1 file changed, 23 insertions(+), 23 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index c3ddd1e1a..2650d1097 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -68,12 +68,12 @@ init: .nightly_rules_all: rules: - - if: '$CI_PIPELINE_SOURCE == "schedule" && $RUNNER =~ /[\S]+rhel-9.4-[^ga][\S]+/ && $NIGHTLY == "true" && $RHEL_MAJOR == "9"' + - if: '$CI_PIPELINE_SOURCE == "schedule" && $RUNNER =~ /[\S]+rhel-9.5-[^ga][\S]+/ && $NIGHTLY == "true" && $RHEL_MAJOR == "9"' - if: '$CI_PIPELINE_SOURCE == "schedule" && $RUNNER =~ /[\S]+rhel-8.10-[^ga][\S]+/ && $NIGHTLY == "true" && $RHEL_MAJOR == "8"' .nightly_rules_x86_64: rules: - - if: '$CI_PIPELINE_SOURCE == "schedule" && $RUNNER =~ /[\S]+rhel-9.4-[^ga][\S]+/ && $RUNNER =~ "/^.*(x86_64).*$/" && $NIGHTLY == "true" && $RHEL_MAJOR == "9"' + - if: '$CI_PIPELINE_SOURCE == "schedule" && $RUNNER =~ /[\S]+rhel-9.5-[^ga][\S]+/ && $RUNNER =~ "/^.*(x86_64).*$/" && $NIGHTLY == "true" && $RHEL_MAJOR == "9"' - if: '$CI_PIPELINE_SOURCE == "schedule" && $RUNNER =~ /[\S]+rhel-8.10-[^ga][\S]+/ && $RUNNER =~ "/^.*(x86_64).*$/" && $NIGHTLY == "true" && $RHEL_MAJOR == "8"' @@ -81,8 +81,8 @@ init: RUNNER: - aws/rhel-8.10-nightly-x86_64 - aws/rhel-8.10-nightly-aarch64 - - aws/rhel-9.4-nightly-x86_64 - - aws/rhel-9.4-nightly-aarch64 + - aws/rhel-9.5-nightly-x86_64 + - aws/rhel-9.5-nightly-aarch64 INTERNAL_NETWORK: ["true"] @@ -165,7 +165,7 @@ Prepare-rhel-internal: # 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.4-nightly-x86_64 + - aws/rhel-9.5-nightly-x86_64 INTERNAL_NETWORK: ["true"] Base: @@ -193,8 +193,8 @@ Base: - RUNNER: - aws/rhel-8.10-nightly-x86_64 - aws/rhel-8.10-nightly-aarch64 - - aws/rhel-9.4-nightly-x86_64 - - aws/rhel-9.4-nightly-aarch64 + - aws/rhel-9.5-nightly-x86_64 + - aws/rhel-9.5-nightly-aarch64 - aws/centos-stream-9-x86_64 - aws/centos-stream-9-aarch64 INTERNAL_NETWORK: ["true"] @@ -224,8 +224,8 @@ Base: - aws/rhel-9.3-ga-aarch64 - aws/rhel-8.10-nightly-x86_64 - aws/rhel-8.10-nightly-aarch64 - - aws/rhel-9.4-nightly-x86_64 - - aws/rhel-9.4-nightly-aarch64 + - aws/rhel-9.5-nightly-x86_64 + - aws/rhel-9.5-nightly-aarch64 - aws/centos-stream-9-x86_64 - aws/centos-stream-9-aarch64 INTERNAL_NETWORK: ["true"] @@ -311,8 +311,8 @@ Image Tests: - aws/rhel-8.4-ga-aarch64 - aws/rhel-8.10-nightly-x86_64 - aws/rhel-8.10-nightly-aarch64 - - aws/rhel-9.4-nightly-x86_64 - - aws/rhel-9.4-nightly-aarch64 + - aws/rhel-9.5-nightly-x86_64 + - aws/rhel-9.5-nightly-aarch64 INTERNAL_NETWORK: ["true"] Trigger-rhel-edge-ci: @@ -342,8 +342,8 @@ Trigger-rhel-edge-ci: - aws/rhel-9.3-ga-x86_64 - aws/rhel-8.10-nightly-x86_64 - aws/rhel-8.10-nightly-aarch64 - - aws/rhel-9.4-nightly-x86_64 - - aws/rhel-9.4-nightly-aarch64 + - aws/rhel-9.5-nightly-x86_64 + - aws/rhel-9.5-nightly-aarch64 - aws/centos-stream-9-x86_64 INTERNAL_NETWORK: ["true"] @@ -420,7 +420,7 @@ aws.sh: rules: # Skip rhel-8.4-ga-x86_64 - if: '$CI_PIPELINE_SOURCE != "schedule" && $RUNNER !~ /[\S]+rhel-8.4-[\S]+/' - - if: '$CI_PIPELINE_SOURCE == "schedule" && $RUNNER =~ /[\S]+rhel-9.4-[^ga][\S]+/ && $NIGHTLY == "true" && $RHEL_MAJOR == "9"' + - if: '$CI_PIPELINE_SOURCE == "schedule" && $RUNNER =~ /[\S]+rhel-9.5-[^ga][\S]+/ && $NIGHTLY == "true" && $RHEL_MAJOR == "9"' - if: '$CI_PIPELINE_SOURCE == "schedule" && $RUNNER =~ /[\S]+rhel-8.10-[^ga][\S]+/ && $NIGHTLY == "true" && $RHEL_MAJOR == "8"' variables: SCRIPT: aws.sh @@ -442,7 +442,7 @@ OpenShift_Virtualization: parallel: matrix: - RUNNER: - - aws/rhel-9.4-nightly-x86_64 + - aws/rhel-9.5-nightly-x86_64 INTERNAL_NETWORK: ["true"] azure.sh: @@ -536,7 +536,7 @@ API: - aws/rhel-8.9-ga-x86_64 - aws/rhel-9.3-ga-x86_64 - aws/rhel-8.10-nightly-x86_64 - - aws/rhel-9.4-nightly-x86_64 + - aws/rhel-9.5-nightly-x86_64 INTERNAL_NETWORK: ["true"] - IMAGE_TYPE: ["iot-commit"] RUNNER: @@ -596,7 +596,7 @@ API-module-hotfixes: - gcp/rhel-8.9-ga-x86_64 - gcp/rhel-9.3-ga-x86_64 - gcp/rhel-8.10-nightly-x86_64 - - gcp/rhel-9.4-nightly-x86_64 + - gcp/rhel-9.5-nightly-x86_64 - gcp/centos-stream-9-x86_64 INTERNAL_NETWORK: ["true"] @@ -634,14 +634,14 @@ weldr-distro-dot-notation+aliases: matrix: - RUNNER: - aws/rhel-8.8-ga-x86_64 - - aws/rhel-9.4-nightly-x86_64 + - aws/rhel-9.5-nightly-x86_64 INTERNAL_NETWORK: ["true"] .generic_s3: extends: .libvirt_integration rules: # BLACKLIST - - if: $RUNNER !~ "/^.*(rhel-8.10|rhel-9.4).*$/" && $CI_PIPELINE_SOURCE != "schedule" && $NIGHTLY != "true" + - if: $RUNNER !~ "/^.*(rhel-8.10|rhel-9.5).*$/" && $CI_PIPELINE_SOURCE != "schedule" && $NIGHTLY != "true" - !reference [.nightly_rules_all, rules] generic_s3_http.sh: @@ -699,7 +699,7 @@ Upgrade: - schutzbot/deploy.sh - /usr/libexec/tests/osbuild-composer/upgrade8to9.sh variables: - RUNNER: rhos-01/rhel-9.4-nightly-x86_64-large + RUNNER: rhos-01/rhel-9.5-nightly-x86_64-large NIGHTLY_FAIL: stage: finish @@ -733,7 +733,7 @@ Installer: matrix: - RUNNER: - rhos-01/rhel-8.10-nightly-x86_64 - - rhos-01/rhel-9.4-nightly-x86_64 + - rhos-01/rhel-9.5-nightly-x86_64 - rhos-01/centos-stream-9-x86_64 ContainerUpload: @@ -766,8 +766,8 @@ ContainerEmbedding: - aws/centos-stream-9-x86_64 - aws/rhel-8.10-nightly-x86_64 - aws/rhel-8.10-nightly-aarch64 - - aws/rhel-9.4-nightly-x86_64 - - aws/rhel-9.4-nightly-aarch64 + - aws/rhel-9.5-nightly-x86_64 + - aws/rhel-9.5-nightly-aarch64 WorkerExecutor: stage: test