diff --git a/dist/pom.xml b/dist/pom.xml index 888e69b4bde..d3f639eec78 100644 --- a/dist/pom.xml +++ b/dist/pom.xml @@ -51,8 +51,12 @@ 314, 322, - 330, - 340 + 330 + + 312db, diff --git a/jenkins/spark-premerge-build.sh b/jenkins/spark-premerge-build.sh index 0cff2cd5c51..42c72e22ca7 100755 --- a/jenkins/spark-premerge-build.sh +++ b/jenkins/spark-premerge-build.sh @@ -50,7 +50,8 @@ mvn_verify() { env -u SPARK_HOME mvn -U -B $MVN_URM_MIRROR -Dbuildver=321 clean install -Drat.skip=true -DskipTests -Dmaven.javadoc.skip=true -Dskip -Dmaven.scalastyle.skip=true -Dcuda.version=$CUDA_CLASSIFIER -pl aggregator -am [[ $BUILD_SNAPSHOTS == "true" ]] && env -u SPARK_HOME mvn -U -B $MVN_URM_MIRROR -Dbuildver=322 clean install -Drat.skip=true -DskipTests -Dmaven.javadoc.skip=true -Dskip -Dmaven.scalastyle.skip=true -Dcuda.version=$CUDA_CLASSIFIER -pl aggregator -am env -u SPARK_HOME mvn -U -B $MVN_URM_MIRROR -Dbuildver=330 clean install -Drat.skip=true -DskipTests -Dmaven.javadoc.skip=true -Dskip -Dmaven.scalastyle.skip=true -Dcuda.version=$CUDA_CLASSIFIER -pl aggregator -am - [[ $BUILD_SNAPSHOTS == "true" ]] && env -u SPARK_HOME mvn -U -B $MVN_URM_MIRROR -Dbuildver=340 clean install -Drat.skip=true -DskipTests -Dmaven.javadoc.skip=true -Dskip -Dmaven.scalastyle.skip=true -Dcuda.version=$CUDA_CLASSIFIER -pl aggregator -am + # Skip 340 now due to https://github.com/NVIDIA/spark-rapids/issues/5688. Need to enable it when #5688 is fixed + # [[ $BUILD_SNAPSHOTS == "true" ]] && env -u SPARK_HOME mvn -U -B $MVN_URM_MIRROR -Dbuildver=340 clean install -Drat.skip=true -DskipTests -Dmaven.javadoc.skip=true -Dskip -Dmaven.scalastyle.skip=true -Dcuda.version=$CUDA_CLASSIFIER -pl aggregator -am # Here run Python integration tests tagged with 'premerge_ci_1' only, that would help balance test duration and memory # consumption from two k8s pods running in parallel, which executes 'mvn_verify()' and 'ci_2()' respectively. diff --git a/jenkins/version-def.sh b/jenkins/version-def.sh index b0b21382b6c..a67f7f76307 100755 --- a/jenkins/version-def.sh +++ b/jenkins/version-def.sh @@ -48,8 +48,9 @@ SPARK_REPO=${SPARK_REPO:-"$URM_URL"} echo "CUDF_VER: $CUDF_VER, CUDA_CLASSIFIER: $CUDA_CLASSIFIER, PROJECT_VER: $PROJECT_VER \ SPARK_VER: $SPARK_VER, SCALA_BINARY_VER: $SCALA_BINARY_VER" - -SPARK_SHIM_VERSIONS_STR=${SPARK_SHIM_VERSIONS_STR:-"311 321cdh 312 313 314 320 321 322 330 340"} +# Remove 340 now due to https://github.com/NVIDIA/spark-rapids/issues/5688. +# Need to add it back when #5688 is fixed +SPARK_SHIM_VERSIONS_STR=${SPARK_SHIM_VERSIONS_STR:-"311 321cdh 312 313 314 320 321 322 330"} IFS=" " <<< $SPARK_SHIM_VERSIONS_STR read -r -a SPARK_SHIM_VERSIONS