Disable 311cdh build due to missing dependency (#4659)

Signed-off-by: Thomas Graves <tgraves@nvidia.com>
NVIDIA · Jan 29, 2022 · ea7c158 · ea7c158
1 parent 73c832b
commit ea7c158
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 11 deletions.
diff --git a/build/buildall b/build/buildall
@@ -127,7 +127,6 @@ case $DIST_PROFILE in
       303
       304
       311
-      311cdh
       312
       313
       320
@@ -143,7 +142,6 @@ case $DIST_PROFILE in
       302
       303
       311
-      311cdh
       312
       320
       321
@@ -153,7 +151,6 @@ case $DIST_PROFILE in
   minimumFeatureVersionMix)
     SPARK_SHIM_VERSIONS=(
       302
-      311cdh
       312
       320
     )

diff --git a/dist/pom.xml b/dist/pom.xml
@@ -56,7 +56,6 @@
             302,
             303,
             311,
-            311cdh,
             312,
             320,
             321
@@ -112,8 +111,7 @@
                 <included_buildvers>
                     302,
                     312,
-                    320,
-                    311cdh
+                    320
                 </included_buildvers>
             </properties>
         </profile>

diff --git a/jenkins/spark-premerge-build.sh b/jenkins/spark-premerge-build.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 #
-# Copyright (c) 2020-2021, NVIDIA CORPORATION. All rights reserved.
+# Copyright (c) 2020-2022, NVIDIA CORPORATION. All rights reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -45,7 +45,6 @@ mvn_verify() {
     env -u SPARK_HOME mvn -U -B $MVN_URM_MIRROR -Dbuildver=304 clean install -Drat.skip=true -DskipTests -Dmaven.javadoc.skip=true -Dskip -Dmaven.scalastyle.skip=true -Dcuda.version=$CUDA_CLASSIFIER -pl aggregator -am
     # don't skip tests and build tools module
     env -u SPARK_HOME mvn -U -B $MVN_URM_MIRROR -Dbuildver=311 clean install -Drat.skip=true -Dmaven.javadoc.skip=true -Dskip -Dmaven.scalastyle.skip=true -Dcuda.version=$CUDA_CLASSIFIER -Dpytest.TEST_TAGS=''
-    env -u SPARK_HOME mvn -U -B $MVN_URM_MIRROR -Dbuildver=311cdh 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=312 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=313 clean install -Drat.skip=true -DskipTests -Dmaven.javadoc.skip=true -Dskip -Dmaven.scalastyle.skip=true -Dcuda.version=$CUDA_CLASSIFIER -pl aggregator -am
     # don't skip tests

diff --git a/jenkins/version-def.sh b/jenkins/version-def.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 #
-# Copyright (c) 2020-2021, NVIDIA CORPORATION. All rights reserved.
+# Copyright (c) 2020-2022, NVIDIA CORPORATION. All rights reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -49,8 +49,8 @@ echo "CUDF_VER: $CUDF_VER, CUDA_CLASSIFIER: $CUDA_CLASSIFIER, PROJECT_VER: $PROJ
     SPARK_VER: $SPARK_VER, SCALA_BINARY_VER: $SCALA_BINARY_VER"
 
 
-SPARK_SHIM_VERSIONS_STR=${SPARK_SHIM_VERSIONS_STR:-"301 302 303 304 311 311cdh 312 313 320 321 322 330"}
+SPARK_SHIM_VERSIONS_STR=${SPARK_SHIM_VERSIONS_STR:-"301 302 303 304 311 312 313 320 321 322 330"}
 
 IFS=" " <<< $SPARK_SHIM_VERSIONS_STR read -r -a SPARK_SHIM_VERSIONS
 
-SPARK_BASE_SHIM_VERSION=${SPARK_SHIM_VERSIONS[0]}
+SPARK_BASE_SHIM_VERSION=${SPARK_SHIM_VERSIONS[0]}