Update the versions for 0.2.0 properly for the databricks build (#271)

* Update the versions properly fro databricks build * use 0.2.0 * Change version to 0.1 to match cluster * Document ci jar name Co-authored-by: Thomas Graves <tgraves@nvidia.com>
NVIDIA · Jun 23, 2020 · ccb10a2 · ccb10a2
1 parent 8483a93
commit ccb10a2
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 4 deletions.
diff --git a/jenkins/Jenkinsfile.databricksnightly b/jenkins/Jenkinsfile.databricksnightly
@@ -63,7 +63,7 @@ pipeline {
             steps {
                 script {
                     sshagent(credentials : ['svcngcc_pubpriv']) {
-                        sh "mvn versions:set -DnewVersion=0.1-databricks-SNAPSHOT && git clean -d -f"
+                        sh "mvn versions:set -DnewVersion=0.2.0-databricks-SNAPSHOT && git clean -d -f"
                         sh "patch -p1 < ./jenkins/databricks/dbimports.patch"
                         sh "tar -zcvf spark-rapids-ci.tgz * || true"
                         sh "python3.6 ./jenkins/databricks/run-tests.py -z ./spark-rapids-ci.tgz -t $DATABRICKS_TOKEN -p /home/svcngcc/.ssh/id_rsa -l ./jenkins/databricks/build.sh"

diff --git a/jenkins/databricks/build.sh b/jenkins/databricks/build.sh
@@ -79,8 +79,11 @@ mvn install:install-file \
 
 mvn -Pdatabricks clean verify -DskipTests
 
-# copy so we pick up new built jar
-sudo cp dist/target/rapids-4-spark_2.12-*-SNAPSHOT.jar /databricks/jars/rapids-4-spark_2.12-0.2.0-SNAPSHOT-ci.jar
+# Copy so we pick up new built jar. Note that the jar name rapids-4-spark_2.12-0.1-SNAPSHOT-ci.jar has to be
+# exactly that because its based on the staticly setup Databricks cluster we use. That cluster specifically
+# installs the jar with the name rapids-4-spark_2.12-0.1-SNAPSHOT-ci.jar. Do not change that name
+# without changing the Databricks cluster setup.
+sudo cp dist/target/rapids-4-spark_2.12-*-SNAPSHOT.jar /databricks/jars/rapids-4-spark_2.12-0.1-SNAPSHOT-ci.jar
 
 # tests
 export PATH=/databricks/conda/envs/databricks-ml-gpu/bin:/databricks/conda/condabin:$PATH

diff --git a/jenkins/databricks/deploy.sh b/jenkins/databricks/deploy.sh
@@ -24,6 +24,6 @@ cd spark-rapids
 echo "Maven mirror is $MVN_URM_MIRROR"
 SERVER_ID='snapshots'
 SERVER_URL='https://urm.nvidia.com:443/artifactory/sw-spark-maven-local'
-FPATH=./dist/target/rapids-4-spark_2.12-0.1-databricks-SNAPSHOT.jar
+FPATH=./dist/target/rapids-4-spark_2.12-0.2.0-databricks-SNAPSHOT.jar
 mvn -B deploy:deploy-file $MVN_URM_MIRROR -Durl=$SERVER_URL -DrepositoryId=$SERVER_ID \
     -Dfile=$FPATH -DpomFile=dist/pom.xml