diff --git a/Jenkinsfile b/Jenkinsfile index a251ac1a3..54c8b9565 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -245,7 +245,7 @@ def BuildCUDA(args) { } def BuildJVMPackagesWithCUDA(args) { - node('linux && gpu') { + node('linux && mgpu') { unstash name: 'srcs' echo "Build XGBoost4J-Spark with Spark ${args.spark_version}, CUDA ${args.cuda_version}" def container_type = "jvm_gpu_build" @@ -440,10 +440,11 @@ def DeployJVMPackages(args) { unstash name: 'srcs' if (env.BRANCH_NAME == 'master' || env.BRANCH_NAME.startsWith('release')) { echo 'Deploying to xgboost-maven-repo S3 repo...' - def container_type = "jvm" - def docker_binary = "docker" sh """ - ${dockerRun} ${container_type} ${docker_binary} tests/ci_build/deploy_jvm_packages.sh ${args.spark_version} + ${dockerRun} jvm docker tests/ci_build/deploy_jvm_packages.sh ${args.spark_version} 0 + """ + sh """ + ${dockerRun} jvm_gpu_build docker --build-arg CUDA_VERSION=10.0 tests/ci_build/deploy_jvm_packages.sh ${args.spark_version} 1 """ } deleteDir() diff --git a/tests/ci_build/deploy_jvm_packages.sh b/tests/ci_build/deploy_jvm_packages.sh index 950cfeb38..50a190862 100755 --- a/tests/ci_build/deploy_jvm_packages.sh +++ b/tests/ci_build/deploy_jvm_packages.sh @@ -3,22 +3,32 @@ set -e set -x -if [ $# -ne 1 ]; then - echo "Usage: $0 [spark version]" +if [ $# -ne 2 ]; then + echo "Usage: $0 [spark version] [build_gpu? 0 or 1]" exit 1 fi spark_version=$1 +build_gpu=$2 # Initialize local Maven repository ./tests/ci_build/initialize_maven.sh -rm -rf build/ cd jvm-packages +rm -rf $(find . -name target) +rm -rf ../build/ # Re-build package without Mock Rabit # Deploy to S3 bucket xgboost-maven-repo -mvn --no-transfer-progress package deploy -P release-to-s3 -Dspark.version=${spark_version} -DskipTests +if [[ "$build_gpu" == "0" ]] +then + # Build CPU artifact + mvn --no-transfer-progress package deploy -P release-to-s3 -Dspark.version=${spark_version} -DskipTests +else + # Build GPU artifact + sed -i -e 's/xgboost\(.*\)_\(.*\)<\/artifactId>/xgboost\1-gpu_\2<\/artifactId>/' $(find . -name pom.xml) + mvn --no-transfer-progress package deploy -Duse.cuda=ON -P release-to-s3 -Dspark.version=${spark_version} -DskipTests +fi set +x set +e diff --git a/tests/python/test_cli.py b/tests/python/test_cli.py index 4efb87e21..e437f426c 100644 --- a/tests/python/test_cli.py +++ b/tests/python/test_cli.py @@ -124,6 +124,8 @@ eval[test] = {data_path} v = xgboost.__version__ if v.find('SNAPSHOT') != -1: assert msg.split(':')[1].strip() == v.split('-')[0] + elif v.find('rc') != -1: + assert msg.split(':')[1].strip() == v.split('rc')[0] else: assert msg.split(':')[1].strip() == v