CI: integration test rules fixup
Just making it more clear and scheduling aws.sh on RHEL-10 and GA runners.
This commit is contained in:
parent
65d5f48847
commit
763cc2ffb0
1 changed files with 5 additions and 7 deletions
|
|
@ -432,8 +432,9 @@ koji.sh (cloudapi):
|
||||||
aws.sh:
|
aws.sh:
|
||||||
extends: .integration
|
extends: .integration
|
||||||
rules:
|
rules:
|
||||||
- if: '$CI_PIPELINE_SOURCE != "schedule" && $RUNNER !~ /[\S]+rhel-[\S]+-(?:(?:ga)|(?:eus))[\S]+/'
|
- !reference [.upstream_rules_all, rules]
|
||||||
- if: '$CI_PIPELINE_SOURCE == "schedule" && $RUNNER =~ /[\S]+rhel-9.5-[^ga][\S]+/ && $NIGHTLY == "true" && $RHEL_MAJOR == "9"'
|
- !reference [.nightly_rules_all, rules]
|
||||||
|
- !reference [.ga_rules_all, rules]
|
||||||
variables:
|
variables:
|
||||||
SCRIPT: aws.sh
|
SCRIPT: aws.sh
|
||||||
|
|
||||||
|
|
@ -483,11 +484,8 @@ azure.sh_hyperv_gen2:
|
||||||
gcp.sh:
|
gcp.sh:
|
||||||
extends: .integration_rhel
|
extends: .integration_rhel
|
||||||
rules:
|
rules:
|
||||||
# Temporarily disabled for RHEL-10 and Centos-10
|
- !reference [.upstream_rules_x86_64, rules]
|
||||||
- if: '$CI_PIPELINE_SOURCE != "schedule" && $RUNNER =~ "/^.*(x86_64).*$/" && $RUNNER !~ /[\S]+rhel-[\S]+-(?:(?:ga)|(?:eus))[\S]+/'
|
- !reference [.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"'
|
|
||||||
# - !reference [.upstream_rules_x86_64, rules]
|
|
||||||
# - !reference [.nightly_rules_x86_64, rules]
|
|
||||||
- !reference [.ga_rules_x86_64, rules]
|
- !reference [.ga_rules_x86_64, rules]
|
||||||
variables:
|
variables:
|
||||||
SCRIPT: gcp.sh
|
SCRIPT: gcp.sh
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue