From 763cc2ffb08a41b9ec0bad70ee7ceed6f292e465 Mon Sep 17 00:00:00 2001 From: Jakub Rusz Date: Wed, 25 Sep 2024 13:46:12 +0200 Subject: [PATCH] CI: integration test rules fixup Just making it more clear and scheduling aws.sh on RHEL-10 and GA runners. --- .gitlab-ci.yml | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index f5826d85a..ca0fd4d4c 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -432,8 +432,9 @@ koji.sh (cloudapi): aws.sh: extends: .integration rules: - - if: '$CI_PIPELINE_SOURCE != "schedule" && $RUNNER !~ /[\S]+rhel-[\S]+-(?:(?:ga)|(?:eus))[\S]+/' - - if: '$CI_PIPELINE_SOURCE == "schedule" && $RUNNER =~ /[\S]+rhel-9.5-[^ga][\S]+/ && $NIGHTLY == "true" && $RHEL_MAJOR == "9"' + - !reference [.upstream_rules_all, rules] + - !reference [.nightly_rules_all, rules] + - !reference [.ga_rules_all, rules] variables: SCRIPT: aws.sh @@ -483,11 +484,8 @@ azure.sh_hyperv_gen2: gcp.sh: extends: .integration_rhel rules: - # Temporarily disabled for RHEL-10 and Centos-10 - - if: '$CI_PIPELINE_SOURCE != "schedule" && $RUNNER =~ "/^.*(x86_64).*$/" && $RUNNER !~ /[\S]+rhel-[\S]+-(?:(?:ga)|(?:eus))[\S]+/' - - 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 [.upstream_rules_x86_64, rules] + - !reference [.nightly_rules_x86_64, rules] - !reference [.ga_rules_x86_64, rules] variables: SCRIPT: gcp.sh