diff --git a/ci/build_cpp.sh b/ci/build_cpp.sh index ed9c1d0426..9ed38fa7ce 100755 --- a/ci/build_cpp.sh +++ b/ci/build_cpp.sh @@ -7,12 +7,7 @@ source rapids-env-update export CMAKE_GENERATOR=Ninja -REPO="rmm" -PR_NUMBER="1095" -COMMIT=$(git ls-remote https://github.com/rapidsai/${REPO}.git refs/heads/pull-request/${PR_NUMBER} | cut -c1-7) -RAPIDS_CUDA_MAJOR="${RAPIDS_CUDA_VERSION%%.*}" -LIBRMM_CHANNEL=$(rapids-get-artifact ci/${REPO}/pull-request/${PR_NUMBER}/${COMMIT}/rmm_conda_cpp_cuda${RAPIDS_CUDA_MAJOR}_$(arch).tar.gz) - +LIBRMM_CHANNEL=$(rapids-get-pr-conda-artifact rmm 1095 cpp) rapids-print-env diff --git a/ci/build_python.sh b/ci/build_python.sh index e19f342e4b..185c7b456a 100755 --- a/ci/build_python.sh +++ b/ci/build_python.sh @@ -13,13 +13,8 @@ rapids-logger "Begin py build" CPP_CHANNEL=$(rapids-download-conda-from-s3 cpp) -REPO="rmm" -PR_NUMBER="1095" -COMMIT=$(git ls-remote https://github.com/rapidsai/${REPO}.git refs/heads/pull-request/${PR_NUMBER} | cut -c1-7) -RAPIDS_CUDA_MAJOR="${RAPIDS_CUDA_VERSION%%.*}" -PYTHON_MINOR_VERSION=$(python --version | sed -E 's/Python [0-9]+\.([0-9]+)\.[0-9]+/\1/g') -LIBRMM_CHANNEL=$(rapids-get-artifact ci/${REPO}/pull-request/${PR_NUMBER}/${COMMIT}/rmm_conda_cpp_cuda${RAPIDS_CUDA_MAJOR}_$(arch).tar.gz) -RMM_CHANNEL=$(rapids-get-artifact ci/${REPO}/pull-request/${PR_NUMBER}/${COMMIT}/rmm_conda_python_cuda${RAPIDS_CUDA_MAJOR}_3${PYTHON_MINOR_VERSION}_$(arch).tar.gz) +LIBRMM_CHANNEL=$(rapids-get-pr-conda-artifact rmm 1095 cpp) +RMM_CHANNEL=$(rapids-get-pr-conda-artifact rmm 1095 python) version=$(rapids-generate-version) git_commit=$(git rev-parse HEAD) diff --git a/ci/test_cpp.sh b/ci/test_cpp.sh index c0a1adf6ff..a3ff377123 100755 --- a/ci/test_cpp.sh +++ b/ci/test_cpp.sh @@ -20,13 +20,8 @@ set -u CPP_CHANNEL=$(rapids-download-conda-from-s3 cpp) -REPO="rmm" -PR_NUMBER="1095" -COMMIT=$(git ls-remote https://github.com/rapidsai/${REPO}.git refs/heads/pull-request/${PR_NUMBER} | cut -c1-7) -RAPIDS_CUDA_MAJOR="${RAPIDS_CUDA_VERSION%%.*}" -PYTHON_MINOR_VERSION=$(python --version | sed -E 's/Python [0-9]+\.([0-9]+)\.[0-9]+/\1/g') -LIBRMM_CHANNEL=$(rapids-get-artifact ci/${REPO}/pull-request/${PR_NUMBER}/${COMMIT}/rmm_conda_cpp_cuda${RAPIDS_CUDA_MAJOR}_$(arch).tar.gz) -RMM_CHANNEL=$(rapids-get-artifact ci/${REPO}/pull-request/${PR_NUMBER}/${COMMIT}/rmm_conda_python_cuda${RAPIDS_CUDA_MAJOR}_3${PYTHON_MINOR_VERSION}_$(arch).tar.gz) +LIBRMM_CHANNEL=$(rapids-get-pr-conda-artifact rmm 1095 cpp) +RMM_CHANNEL=$(rapids-get-pr-conda-artifact rmm 1095 python) RAPIDS_TESTS_DIR=${RAPIDS_TESTS_DIR:-"${PWD}/test-results"}/ mkdir -p "${RAPIDS_TESTS_DIR}" diff --git a/ci/test_python.sh b/ci/test_python.sh index ffaebbc6d6..554155df6d 100755 --- a/ci/test_python.sh +++ b/ci/test_python.sh @@ -22,13 +22,8 @@ rapids-logger "Downloading artifacts from previous jobs" CPP_CHANNEL=$(rapids-download-conda-from-s3 cpp) PYTHON_CHANNEL=$(rapids-download-conda-from-s3 python) -REPO="rmm" -PR_NUMBER="1095" -COMMIT=$(git ls-remote https://github.com/rapidsai/${REPO}.git refs/heads/pull-request/${PR_NUMBER} | cut -c1-7) -RAPIDS_CUDA_MAJOR="${RAPIDS_CUDA_VERSION%%.*}" -PYTHON_MINOR_VERSION=$(python --version | sed -E 's/Python [0-9]+\.([0-9]+)\.[0-9]+/\1/g') -LIBRMM_CHANNEL=$(rapids-get-artifact ci/${REPO}/pull-request/${PR_NUMBER}/${COMMIT}/rmm_conda_cpp_cuda${RAPIDS_CUDA_MAJOR}_$(arch).tar.gz) -RMM_CHANNEL=$(rapids-get-artifact ci/${REPO}/pull-request/${PR_NUMBER}/${COMMIT}/rmm_conda_python_cuda${RAPIDS_CUDA_MAJOR}_3${PYTHON_MINOR_VERSION}_$(arch).tar.gz) +LIBRMM_CHANNEL=$(rapids-get-pr-conda-artifact rmm 1095 cpp) +RMM_CHANNEL=$(rapids-get-pr-conda-artifact rmm 1095 python) RAPIDS_TESTS_DIR=${RAPIDS_TESTS_DIR:-"${PWD}/test-results"} RAPIDS_COVERAGE_DIR=${RAPIDS_COVERAGE_DIR:-"${PWD}/coverage-results"}