From 63134ff2a1094e3159f34e3bd30f166517428220 Mon Sep 17 00:00:00 2001 From: "Robert (Bobby) Evans" Date: Tue, 10 Nov 2020 21:35:12 -0600 Subject: [PATCH] Fix the integration build (#1090) Signed-off-by: Robert (Bobby) Evans --- jenkins/spark-tests.sh | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/jenkins/spark-tests.sh b/jenkins/spark-tests.sh index 67caf7742e3..68bfba2fdf3 100755 --- 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 +