Fix the integration build (#1090)

Signed-off-by: Robert (Bobby) Evans <[email protected]>
NVIDIA · Nov 11, 2020 · 63134ff · 63134ff
1 parent 65bc02e
commit 63134ff
Showing 1 changed file with 7 additions and 3 deletions.
diff --git a/jenkins/spark-tests.sh b/jenkins/spark-tests.sh
@@ -78,11 +78,10 @@ MORTGAGE_SPARK_SUBMIT_ARGS=" --conf spark.plugins=com.nvidia.spark.SQLPlugin \
     --class com.nvidia.spark.rapids.tests.mortgage.Main \
     $RAPIDS_TEST_JAR"
 
-RAPIDS_FILE_NAME=${RAPIDS_PLUGIN_JAR##*/}
 CUDF_UDF_TEST_ARGS="--conf spark.rapids.memory.gpu.allocFraction=0.1 \
     --conf spark.rapids.python.memory.gpu.allocFraction=0.1 \
     --conf spark.rapids.python.concurrentPythonWorkers=2 \
-    --conf spark.executorEnv.PYTHONPATH=${RAPIDS_FILE_NAME} \
+    --conf spark.executorEnv.PYTHONPATH=${RAPIDS_PLUGIN_JAR} \
     --conf spark.pyspark.python=/opt/conda/bin/python \
     --py-files ${RAPIDS_PLUGIN_JAR}" # explicitly specify python binary path in env w/ multiple python versions
 
@@ -100,5 +99,10 @@ jps
 echo "----------------------------START TEST------------------------------------"
 rm -rf $OUTPUT
 spark-submit $BASE_SPARK_SUBMIT_ARGS $SERIALIZER $MORTGAGE_SPARK_SUBMIT_ARGS $TEST_PARAMS
-cd $RAPIDS_INT_TESTS_HOME && spark-submit $BASE_SPARK_SUBMIT_ARGS --jars $RAPIDS_TEST_JAR ./runtests.py -v -rfExXs --std_input_path="$WORKSPACE/integration_tests/src/test/resources/"
+pushd $RAPIDS_INT_TESTS_HOME
+spark-submit $BASE_SPARK_SUBMIT_ARGS --jars $RAPIDS_TEST_JAR ./runtests.py -v -rfExXs --std_input_path="$WORKSPACE/integration_tests/src/test/resources/"
 spark-submit $BASE_SPARK_SUBMIT_ARGS $CUDF_UDF_TEST_ARGS --jars $RAPIDS_TEST_JAR ./runtests.py -m "cudf_udf" -v -rfExXs --cudf_udf
+popd
+stop-slave.sh
+stop-master.sh
+