diff --git a/Jenkinsfile b/Jenkinsfile index 1471c5509..32f05ff88 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -179,8 +179,9 @@ def BuildCPUARM64() { stash name: "xgboost_whl_arm64_cpu", includes: 'python-package/dist/*.whl' if (env.BRANCH_NAME == 'master' || env.BRANCH_NAME.startsWith('release')) { echo 'Uploading Python wheel...' - path = "${BRANCH_NAME}/" - s3Upload bucket: 'xgboost-nightly-builds', path: path, acl: 'PublicRead', workingDir: 'python-package/dist', includePathPattern:'**/*.whl' + sh """ + ${dockerRun} ${container_type} ${docker_binary} bash -c "source activate aarch64_test && python -m awscli s3 cp python-package/dist/*.whl s3://xgboost-nightly-builds/${BRANCH_NAME}/ --acl public-read --no-progress" + """ } stash name: 'xgboost_cli_arm64', includes: 'xgboost' deleteDir() @@ -232,8 +233,9 @@ def BuildCUDA(args) { stash name: "xgboost_whl_cuda${args.cuda_version}", includes: 'python-package/dist/*.whl' if (args.cuda_version == ref_cuda_ver && (env.BRANCH_NAME == 'master' || env.BRANCH_NAME.startsWith('release'))) { echo 'Uploading Python wheel...' - path = "${BRANCH_NAME}/" - s3Upload bucket: 'xgboost-nightly-builds', path: path, acl: 'PublicRead', workingDir: 'python-package/dist', includePathPattern:'**/*.whl' + sh """ + ${dockerRun} ${container_type} ${docker_binary} ${docker_args} python -m awscli s3 cp python-package/dist/*.whl s3://xgboost-nightly-builds/${BRANCH_NAME}/ --acl public-read --no-progress + """ } echo 'Stashing C++ test executable (testxgboost)...' stash name: "xgboost_cpp_tests_cuda${args.cuda_version}", includes: 'build/testxgboost' @@ -268,8 +270,9 @@ def BuildRPackageWithCUDA(args) { ${dockerRun} ${container_type} ${docker_binary} ${docker_args} tests/ci_build/build_r_pkg_with_cuda.sh ${commit_id} """ echo 'Uploading R tarball...' - path = "${BRANCH_NAME}/" - s3Upload bucket: 'xgboost-nightly-builds', path: path, acl: 'PublicRead', includePathPattern:'xgboost_r_gpu_linux_*.tar.gz' + sh """ + ${dockerRun} ${container_type} ${docker_binary} ${docker_args} python -m awscli s3 cp xgboost_r_gpu_linux_*.tar.gz s3://xgboost-nightly-builds/${BRANCH_NAME}/ --acl public-read --no-progress + """ } deleteDir() } @@ -325,7 +328,9 @@ def BuildJVMDoc() { """ if (env.BRANCH_NAME == 'master' || env.BRANCH_NAME.startsWith('release')) { echo 'Uploading doc...' - s3Upload file: "jvm-packages/${BRANCH_NAME}.tar.bz2", bucket: 'xgboost-docs', acl: 'PublicRead', path: "${BRANCH_NAME}.tar.bz2" + sh """ + ${dockerRun} ${container_type} ${docker_binary} python -m awscli s3 cp jvm-packages/${BRANCH_NAME}.tar.bz2 s3://xgboost-docs/${BRANCH_NAME}.tar.bz2 --acl public-read --no-progress + """ } deleteDir() } diff --git a/tests/ci_build/Dockerfile.gpu_build_centos7 b/tests/ci_build/Dockerfile.gpu_build_centos7 index bc04a282e..a8f7b2492 100644 --- a/tests/ci_build/Dockerfile.gpu_build_centos7 +++ b/tests/ci_build/Dockerfile.gpu_build_centos7 @@ -11,6 +11,7 @@ RUN \ # Python wget -nv -nc -O Miniconda3.sh https://repo.anaconda.com/miniconda/Miniconda3-latest-Linux-x86_64.sh && \ bash Miniconda3.sh -b -p /opt/python && \ + /opt/python/bin/python -m pip install awscli && \ # CMake wget -nv -nc https://cmake.org/files/v3.14/cmake-3.14.0-Linux-x86_64.sh --no-check-certificate && \ bash cmake-3.14.0-Linux-x86_64.sh --skip-license --prefix=/usr diff --git a/tests/ci_build/Dockerfile.gpu_build_r_centos7 b/tests/ci_build/Dockerfile.gpu_build_r_centos7 index f9eb30718..dc22c3095 100644 --- a/tests/ci_build/Dockerfile.gpu_build_r_centos7 +++ b/tests/ci_build/Dockerfile.gpu_build_r_centos7 @@ -32,7 +32,7 @@ RUN \ # Python wget -nv -nc -O Miniconda3.sh https://repo.anaconda.com/miniconda/Miniconda3-latest-Linux-x86_64.sh && \ bash Miniconda3.sh -b -p /opt/python && \ - /opt/python/bin/python -m pip install auditwheel && \ + /opt/python/bin/python -m pip install auditwheel awscli && \ # CMake wget -nv -nc https://cmake.org/files/v3.14/cmake-3.14.0-Linux-x86_64.sh --no-check-certificate && \ bash cmake-3.14.0-Linux-x86_64.sh --skip-license --prefix=/usr diff --git a/tests/ci_build/conda_env/aarch64_test.yml b/tests/ci_build/conda_env/aarch64_test.yml index cbf9ae92d..f74833ebf 100644 --- a/tests/ci_build/conda_env/aarch64_test.yml +++ b/tests/ci_build/conda_env/aarch64_test.yml @@ -22,6 +22,8 @@ dependencies: - ninja - boto3 - jsonschema +- boto3 +- awscli - numba - llvmlite - pip: