diff --git a/jenkins/hybrid_execution.sh b/jenkins/hybrid_execution.sh index 94e9f62b97a..a90cf8e6502 100755 --- a/jenkins/hybrid_execution.sh +++ b/jenkins/hybrid_execution.sh @@ -30,6 +30,7 @@ hybrid_prepare(){ echo "cup_arch=$cup_arch, os_version=$os_version, SCALA_BINARY_VER=$SCALA_BINARY_VER" if [[ ! ("$cup_arch" == "x86_64" && ("$os_version" == "ubuntu_20.04" || "$os_version" == "ubuntu_22.04") && "$SCALA_BINARY_VER" == "2.12") ]]; then echo "SKIP! Only supports running Scala 2.12 hybrid execution tests on an x86_64 processor under Ubuntu 20.04 or 22.04." + return 1 fi echo "Downloading hybrid execution dependency jars..." diff --git a/jenkins/spark-premerge-build.sh b/jenkins/spark-premerge-build.sh index 3dccbbf34a4..f9ebccc37dc 100755 --- a/jenkins/spark-premerge-build.sh +++ b/jenkins/spark-premerge-build.sh @@ -112,11 +112,8 @@ mvn_verify() { # test Hybrid feature source "${WORKSPACE}/jenkins/hybrid_execution.sh" - result=$(hybrid_prepare) - if [ $result == 0 ]; then + if hybrid_prepare ; then hybrid_test - else - echo "Skipped hybrid execution tests $result" fi } diff --git a/jenkins/spark-tests.sh b/jenkins/spark-tests.sh index 79239359e38..50aa5524bc7 100755 --- a/jenkins/spark-tests.sh +++ b/jenkins/spark-tests.sh @@ -354,11 +354,8 @@ fi # hybrid execution tests if [[ "$TEST_MODE" == "DEFAULT" || "$TEST_MODE" == "HYBRID_EXECUTION" ]]; then source "${WORKSPACE}/jenkins/hybrid_execution.sh" - result=$(hybrid_prepare) - if [ $result == 0 ]; then + if hybrid_prepare ; then hybrid_test - else - echo "Skipped hybrid execution tests $result" fi fi