diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index a1c82f8a1..ebe71a47c 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -485,7 +485,9 @@ azure.sh_hyperv_gen2: gcp.sh: extends: .integration_rhel rules: - - !reference [.upstream_rules_x86_64, rules] + # 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] - !reference [.nightly_rules_x86_64, rules] - !reference [.ga_rules_x86_64, rules] variables: diff --git a/test/cases/aws.sh b/test/cases/aws.sh index 3dba332a8..f9acf5b60 100755 --- a/test/cases/aws.sh +++ b/test/cases/aws.sh @@ -262,6 +262,7 @@ if nvrGreaterOrEqual "osbuild-composer" "83"; then # TODO: Remove this workaround, once CLOUDX-994 is resolved if [[ ($ID == rhel || $ID == centos) && ${VERSION_ID%.*} == 10 ]]; then RESULTS=1 + yellowprint "WARNING: cloud-image-val currently skipped until CLOUDX-994 is resolved!" else sudo "${CONTAINER_RUNTIME}" run \ --net=host \ diff --git a/test/cases/azure.sh b/test/cases/azure.sh index 328079445..5138ecb8b 100755 --- a/test/cases/azure.sh +++ b/test/cases/azure.sh @@ -243,6 +243,7 @@ if nvrGreaterOrEqual "osbuild-composer" "83"; then # TODO: Remove this workaround, once CLOUDX-994 is resolved if [[ ($ID == rhel || $ID == centos) && ${VERSION_ID%.*} == 10 ]]; then RESULTS=1 + yellowprint "WARNING: cloud-image-val currently skipped until CLOUDX-994 is resolved!" else sudo "${CONTAINER_RUNTIME}" run \ --net=host \ diff --git a/test/cases/gcp.sh b/test/cases/gcp.sh index 9a885ce17..640055d22 100755 --- a/test/cases/gcp.sh +++ b/test/cases/gcp.sh @@ -14,7 +14,7 @@ set -euo pipefail if [[ ($ID == rhel || $ID == centos) && ${VERSION_ID%.*} == 10 ]]; then echo "Temporary disabled b/c GCP isn't suported on el10" - exit 0 + exit 1 fi # Container image used for cloud provider CLI tools diff --git a/test/cases/shared_lib.sh b/test/cases/shared_lib.sh index b38f55863..1256c553d 100755 --- a/test/cases/shared_lib.sh +++ b/test/cases/shared_lib.sh @@ -38,6 +38,10 @@ function greenprint { echo -e "\033[1;32m[$(date -Isecond)] ${1}\033[0m" } +function yellowprint { + echo -e "\033[1;33m[$(date -Isecond)] ${1}\033[0m" +} + function redprint { echo -e "\033[1;31m[$(date -Isecond)] ${1}\033[0m" }