Skip to content

Commit 763cc2f

Browse files
committed
CI: integration test rules fixup
Just making it more clear and scheduling aws.sh on RHEL-10 and GA runners.
1 parent 65d5f48 commit 763cc2f

File tree

1 file changed

+5
-7
lines changed

1 file changed

+5
-7
lines changed

.gitlab-ci.yml

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -432,8 +432,9 @@ koji.sh (cloudapi):
432432
aws.sh:
433433
extends: .integration
434434
rules:
435-
- if: '$CI_PIPELINE_SOURCE != "schedule" && $RUNNER !~ /[\S]+rhel-[\S]+-(?:(?:ga)|(?:eus))[\S]+/'
436-
- if: '$CI_PIPELINE_SOURCE == "schedule" && $RUNNER =~ /[\S]+rhel-9.5-[^ga][\S]+/ && $NIGHTLY == "true" && $RHEL_MAJOR == "9"'
435+
- !reference [.upstream_rules_all, rules]
436+
- !reference [.nightly_rules_all, rules]
437+
- !reference [.ga_rules_all, rules]
437438
variables:
438439
SCRIPT: aws.sh
439440

@@ -483,11 +484,8 @@ azure.sh_hyperv_gen2:
483484
gcp.sh:
484485
extends: .integration_rhel
485486
rules:
486-
# Temporarily disabled for RHEL-10 and Centos-10
487-
- if: '$CI_PIPELINE_SOURCE != "schedule" && $RUNNER =~ "/^.*(x86_64).*$/" && $RUNNER !~ /[\S]+rhel-[\S]+-(?:(?:ga)|(?:eus))[\S]+/'
488-
- if: '$CI_PIPELINE_SOURCE == "schedule" && $RUNNER =~ /[\S]+rhel-9.5-[^ga][\S]+/ && $RUNNER =~ "/^.*(x86_64).*$/" && $NIGHTLY == "true" && $RHEL_MAJOR == "9"'
489-
# - !reference [.upstream_rules_x86_64, rules]
490-
# - !reference [.nightly_rules_x86_64, rules]
487+
- !reference [.upstream_rules_x86_64, rules]
488+
- !reference [.nightly_rules_x86_64, rules]
491489
- !reference [.ga_rules_x86_64, rules]
492490
variables:
493491
SCRIPT: gcp.sh

0 commit comments

Comments
 (0)