More CI script updates

rapidsai · Jan 3, 2025 · 213efbb · 213efbb
1 parent 0247781
commit 213efbb
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 4 deletions.
diff --git a/ci/build_cpp.sh b/ci/build_cpp.sh
@@ -18,8 +18,9 @@ rapids-logger "Begin cpp build"
 sccache --zero-stats
 
 LIBRMM_CHANNEL=$(rapids-get-pr-conda-artifact rmm 1776 cpp)
+LIBRAFT_CHANNEL=$(rapids-get-pr-conda-artifact raft 2534 cpp)
 
-RAPIDS_PACKAGE_VERSION=$(rapids-generate-version) rapids-conda-retry mambabuild --channel "${LIBRMM_CHANNEL}" conda/recipes/libcuml
+RAPIDS_PACKAGE_VERSION=$(rapids-generate-version) rapids-conda-retry mambabuild --channel "${LIBRMM_CHANNEL}" --channel "${LIBRAFT_CHANNEL}" conda/recipes/libcuml
 
 sccache --show-adv-stats
 

diff --git a/ci/build_python.sh b/ci/build_python.sh
@@ -19,6 +19,8 @@ rapids-logger "Begin py build"
 
 LIBRMM_CHANNEL=$(rapids-get-pr-conda-artifact rmm 1776 cpp)
 PYLIBRMM_CHANNEL=$(rapids-get-pr-conda-artifact rmm 1776 python)
+LIBRAFT_CHANNEL=$(rapids-get-pr-conda-artifact raft 2534 cpp)
+PYLIBRAFT_CHANNEL=$(rapids-get-pr-conda-artifact raft 2534 python)
 CPP_CHANNEL=$(rapids-download-conda-from-s3 cpp)
 
 sccache --zero-stats
@@ -30,6 +32,8 @@ RAPIDS_PACKAGE_VERSION=$(head -1 ./VERSION) rapids-conda-retry mambabuild \
   --channel "${CPP_CHANNEL}" \
   --channel "${LIBRMM_CHANNEL}" \
   --channel "${PYLIBRMM_CHANNEL}" \
+  --channel "${LIBRAFT_CHANNEL}" \
+  --channel "${PYLIBRAFT_CHANNEL}" \
   conda/recipes/cuml
 
 sccache --show-adv-stats

diff --git a/ci/test_cpp.sh b/ci/test_cpp.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-# Copyright (c) 2022-2024, NVIDIA CORPORATION.
+# Copyright (c) 2022-2025, NVIDIA CORPORATION.
 
 set -euo pipefail
 
@@ -9,14 +9,16 @@ cd "$(dirname "$(realpath "${BASH_SOURCE[0]}")")"/../
 . /opt/conda/etc/profile.d/conda.sh
 
 rapids-logger "Downloading artifacts from previous jobs"
+LIBRMM_CHANNEL=$(rapids-get-pr-conda-artifact rmm 1776 cpp)
+LIBRAFT_CHANNEL=$(rapids-get-pr-conda-artifact raft 2534 cpp)
 CPP_CHANNEL=$(rapids-download-conda-from-s3 cpp)
 
 rapids-logger "Generate C++ testing dependencies"
 rapids-dependency-file-generator \
   --output conda \
   --file-key test_cpp \
   --matrix "cuda=${RAPIDS_CUDA_VERSION%.*};arch=$(arch)" \
-  --prepend-channel "${CPP_CHANNEL}" | tee env.yaml
+  -prepend--channel "${LIBRMM_CHANNEL}" --prepend-channel "${LIBRAFT_CHANNEL}" --prepend-channel "${CPP_CHANNEL}" | tee env.yaml
 
 rapids-mamba-retry env create --yes -f env.yaml -n test
 

diff --git a/ci/test_python_common.sh b/ci/test_python_common.sh
@@ -1,11 +1,15 @@
 #!/bin/bash
-# Copyright (c) 2022-2024, NVIDIA CORPORATION.
+# Copyright (c) 2022-2025, NVIDIA CORPORATION.
 
 set -euo pipefail
 
 . /opt/conda/etc/profile.d/conda.sh
 
 rapids-logger "Downloading artifacts from previous jobs"
+LIBRMM_CHANNEL=$(rapids-get-pr-conda-artifact rmm 1776 cpp)
+PYLIBRMM_CHANNEL=$(rapids-get-pr-conda-artifact rmm 1776 python)
+LIBRAFT_CHANNEL=$(rapids-get-pr-conda-artifact raft 2534 cpp)
+PYLIBRAFT_CHANNEL=$(rapids-get-pr-conda-artifact raft 2534 python)
 CPP_CHANNEL=$(rapids-download-conda-from-s3 cpp)
 PYTHON_CHANNEL=$(rapids-download-conda-from-s3 python)
 
@@ -14,6 +18,10 @@ rapids-dependency-file-generator \
   --output conda \
   --file-key test_python \
   --matrix "cuda=${RAPIDS_CUDA_VERSION%.*};arch=$(arch);py=${RAPIDS_PY_VERSION}" \
+  --prepend-channel "${LIBRMM_CHANNEL}" \
+  --prepend-channel "${PYLIBRMM_CHANNEL}" \
+  --prepend-channel "${LIBRAFT_CHANNEL}" \
+  --prepend-channel "${PYLIBRAFT_CHANNEL}" \
   --prepend-channel "${CPP_CHANNEL}" \
   --prepend-channel "${PYTHON_CHANNEL}" | tee env.yaml