diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 5c4b04ccc5..4797872b50 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -494,10 +494,10 @@ vmware.sh_vmdk: rules: # Run only on x86_64 # Temporarily disabled for RHEL-10 and Centos-10 - - if: '$CI_PIPELINE_SOURCE != "schedule" && $RUNNER =~ "/^.*(x86_64).*$/" && $RUNNER !~ /[\S]+rhel-[\S]+-(?:(?:ga)|(?:eus))[\S]+/ && $RUNNER !~ "/^.*(rhel-10.0-nightly|centos-stream-10).*$/"' - - if: '$CI_PIPELINE_SOURCE == "schedule" && $RUNNER =~ /[\S]+rhel-9.6-[^ga][\S]+/ && $RUNNER =~ "/^.*(x86_64).*$/" && $NIGHTLY == "true" && $RHEL_MAJOR == "9"' - # - !reference [.upstream_rules_x86_64, rules] - # - !reference [.nightly_rules_x86_64, rules] + #- if: '$CI_PIPELINE_SOURCE != "schedule" && $RUNNER =~ "/^.*(x86_64).*$/" && $RUNNER !~ /[\S]+rhel-[\S]+-(?:(?:ga)|(?:eus))[\S]+/ && $RUNNER !~ "/^.*(rhel-10.0-nightly|centos-stream-10).*$/"' + #- if: '$CI_PIPELINE_SOURCE == "schedule" && $RUNNER =~ /[\S]+rhel-9.6-[^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] variables: SCRIPT: vmware.sh vmdk @@ -507,10 +507,10 @@ vmware.sh_ova: rules: # Run only on x86_64 # Temporarily disabled for RHEL-10 and Centos-10 - - if: '$CI_PIPELINE_SOURCE != "schedule" && $RUNNER =~ "/^.*(x86_64).*$/" && $RUNNER !~ /[\S]+rhel-[\S]+-(?:(?:ga)|(?:eus))[\S]+/ && $RUNNER !~ "/^.*(rhel-10.0-nightly|centos-stream-10).*$/"' - # - !reference [.upstream_rules_x86_64, rules] - - if: '$CI_PIPELINE_SOURCE == "schedule" && $RUNNER =~ /[\S]+rhel-9.6-[^ga][\S]+/ && $RUNNER =~ "/^.*(x86_64).*$/" && $NIGHTLY == "true" && $RHEL_MAJOR == "9"' - # - !reference [.nightly_rules_x86_64, rules] + #- if: '$CI_PIPELINE_SOURCE != "schedule" && $RUNNER =~ "/^.*(x86_64).*$/" && $RUNNER !~ /[\S]+rhel-[\S]+-(?:(?:ga)|(?:eus))[\S]+/ && $RUNNER !~ "/^.*(rhel-10.0-nightly|centos-stream-10).*$/"' + - !reference [.upstream_rules_x86_64, rules] + #- if: '$CI_PIPELINE_SOURCE == "schedule" && $RUNNER =~ /[\S]+rhel-9.6-[^ga][\S]+/ && $RUNNER =~ "/^.*(x86_64).*$/" && $NIGHTLY == "true" && $RHEL_MAJOR == "9"' + - !reference [.nightly_rules_x86_64, rules] - !reference [.ga_rules_x86_64, rules] variables: SCRIPT: vmware.sh ova @@ -567,6 +567,7 @@ API: - azure - gcp - oci + - vsphere RUNNER: - aws/rhel-10.0-nightly-x86_64 INTERNAL_NETWORK: ["true"]