Skip to content

Commit

Permalink
Remove rhel-8.10 jobs from test matrix
Browse files Browse the repository at this point in the history
Related: COMPOSER-2226
  • Loading branch information
atodorov committed Jun 17, 2024
1 parent b8a2592 commit 0361013
Showing 1 changed file with 1 addition and 20 deletions.
21 changes: 1 addition & 20 deletions .gitlab-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -69,18 +69,14 @@ init:
.nightly_rules_all:
rules:
- 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.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"'


.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

Expand Down Expand Up @@ -164,7 +160,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"]

Expand All @@ -191,8 +186,6 @@ Base:
- aws/rhel-9.3-ga-x86_64
- aws/rhel-9.3-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
Expand Down Expand Up @@ -222,8 +215,6 @@ Base:
- 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-9.5-nightly-x86_64
- aws/rhel-9.5-nightly-aarch64
- aws/centos-stream-9-x86_64
Expand Down Expand Up @@ -307,8 +298,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"]
Expand Down Expand Up @@ -338,8 +327,6 @@ Trigger-rhel-edge-ci:
- 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-9.5-nightly-x86_64
- aws/rhel-9.5-nightly-aarch64
- aws/centos-stream-9-x86_64
Expand Down Expand Up @@ -419,7 +406,6 @@ aws.sh:
# 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.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

Expand Down Expand Up @@ -533,7 +519,6 @@ API:
RUNNER:
- aws/rhel-8.9-ga-x86_64
- aws/rhel-9.3-ga-x86_64
- aws/rhel-8.10-nightly-x86_64
- aws/rhel-9.5-nightly-x86_64
INTERNAL_NETWORK: ["true"]
- IMAGE_TYPE: ["iot-commit"]
Expand Down Expand Up @@ -593,7 +578,6 @@ API-module-hotfixes:
- RUNNER:
- gcp/rhel-8.9-ga-x86_64
- gcp/rhel-9.3-ga-x86_64
- gcp/rhel-8.10-nightly-x86_64
- gcp/rhel-9.5-nightly-x86_64
- gcp/centos-stream-9-x86_64
INTERNAL_NETWORK: ["true"]
Expand Down Expand Up @@ -639,7 +623,7 @@ weldr-distro-dot-notation+aliases:
extends: .libvirt_integration
rules:
# BLACKLIST
- if: $RUNNER !~ "/^.*(rhel-8.10|rhel-9.5).*$/" && $CI_PIPELINE_SOURCE != "schedule" && $NIGHTLY != "true"
- if: $RUNNER !~ "/^.*(rhel-9.5).*$/" && $CI_PIPELINE_SOURCE != "schedule" && $NIGHTLY != "true"
- !reference [.nightly_rules_all, rules]

generic_s3_http.sh:
Expand Down Expand Up @@ -730,7 +714,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

Expand Down Expand Up @@ -762,8 +745,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

Expand Down

0 comments on commit 0361013

Please sign in to comment.