From 867a1a1dd95bbd822f3e116ea08a600641beda36 Mon Sep 17 00:00:00 2001
From: Mark Harris <783069+harrism@users.noreply.github.com>
Date: Thu, 16 Nov 2023 05:57:57 +0000
Subject: [PATCH] Fix scripts

---
 ci/build_cpp.sh      | 3 ++-
 ci/build_docs.sh     | 3 +++
 ci/build_python.sh   | 2 ++
 ci/test_cpp.sh       | 3 ---
 ci/test_notebooks.sh | 3 +++
 ci/test_python.sh    | 3 +++
 6 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/ci/build_cpp.sh b/ci/build_cpp.sh
index 690c8fa7eaf..029aea22540 100755
--- a/ci/build_cpp.sh
+++ b/ci/build_cpp.sh
@@ -19,7 +19,8 @@ rapids-logger "Begin cpp build"
 
 RAPIDS_PACKAGE_VERSION=${version} rapids-conda-retry mambabuild \
   --channel "${LIBRMM_CHANNEL}" \
-  --channel "${RMM_CHANNEL}" \
+  --channel "${LIBCUDF_CHANNEL}" \
+  --channel "${LIBRAFT_CHANNEL}" \
   conda/recipes/libcugraph
 
 rapids-upload-conda-to-s3 cpp
diff --git a/ci/build_docs.sh b/ci/build_docs.sh
index 3cb21f35607..ed8019a0647 100755
--- a/ci/build_docs.sh
+++ b/ci/build_docs.sh
@@ -21,8 +21,11 @@ CPP_CHANNEL=$(rapids-download-conda-from-s3 cpp)
 PYTHON_CHANNEL=$(rapids-download-conda-from-s3 python)
 
 LIBRMM_CHANNEL=$(rapids-get-pr-conda-artifact rmm 1095 cpp)
+RMM_CHANNEL=$(rapids-get-pr-conda-artifact rmm 1095 python)
 LIBCUDF_CHANNEL=$(rapids-get-pr-conda-artifact cudf 14365 cpp)
+CUDF_CHANNEL=$(rapids-get-pr-conda-artifact cudf 14365 python)
 LIBRAFT_CHANNEL=$(rapids-get-pr-conda-artifact raft 1964 cpp)
+RAFT_CHANNEL=$(rapids-get-pr-conda-artifact raft 1964 python)
 
 rapids-mamba-retry install \
   --channel "${CPP_CHANNEL}" \
diff --git a/ci/build_python.sh b/ci/build_python.sh
index 05a8be002eb..57860b8c837 100755
--- a/ci/build_python.sh
+++ b/ci/build_python.sh
@@ -12,7 +12,9 @@ rapids-print-env
 CPP_CHANNEL=$(rapids-download-conda-from-s3 cpp)
 
 LIBRMM_CHANNEL=$(rapids-get-pr-conda-artifact rmm 1095 cpp)
+RMM_CHANNEL=$(rapids-get-pr-conda-artifact rmm 1095 python)
 LIBCUDF_CHANNEL=$(rapids-get-pr-conda-artifact cudf 14365 cpp)
+CUDF_CHANNEL=$(rapids-get-pr-conda-artifact cudf 14365 python)
 LIBRAFT_CHANNEL=$(rapids-get-pr-conda-artifact raft 1964 cpp)
 RAFT_CHANNEL=$(rapids-get-pr-conda-artifact raft 1964 python)
 
diff --git a/ci/test_cpp.sh b/ci/test_cpp.sh
index 1505ca595d2..b3bc7a0bafb 100755
--- a/ci/test_cpp.sh
+++ b/ci/test_cpp.sh
@@ -32,11 +32,8 @@ rapids-print-env
 rapids-mamba-retry install \
     --channel "${CPP_CHANNEL}" \
     --channel "${LIBRMM_CHANNEL}" \
-    --channel "${RMM_CHANNEL}" \
     --channel "${LIBCUDF_CHANNEL}" \
-    --channel "${CUDF_CHANNEL}" \
     --channel "${LIBRAFT_CHANNEL}" \
-    --channel "${RAFT_CHANNEL}" \
     libcugraph libcugraph_etl libcugraph-tests
 
 rapids-logger "Check GPU usage"
diff --git a/ci/test_notebooks.sh b/ci/test_notebooks.sh
index 357af8b9841..5f8e2a4d0d2 100755
--- a/ci/test_notebooks.sh
+++ b/ci/test_notebooks.sh
@@ -25,8 +25,11 @@ CPP_CHANNEL=$(rapids-download-conda-from-s3 cpp)
 PYTHON_CHANNEL=$(rapids-download-conda-from-s3 python)
 
 LIBRMM_CHANNEL=$(rapids-get-pr-conda-artifact rmm 1095 cpp)
+RMM_CHANNEL=$(rapids-get-pr-conda-artifact rmm 1095 python)
 LIBCUDF_CHANNEL=$(rapids-get-pr-conda-artifact cudf 14365 cpp)
+CUDF_CHANNEL=$(rapids-get-pr-conda-artifact cudf 14365 python)
 LIBRAFT_CHANNEL=$(rapids-get-pr-conda-artifact raft 1964 cpp)
+RAFT_CHANNEL=$(rapids-get-pr-conda-artifact raft 1964 python)
 
 rapids-mamba-retry install \
   --channel "${CPP_CHANNEL}" \
diff --git a/ci/test_python.sh b/ci/test_python.sh
index c7e4a127ad7..af36913b03b 100755
--- a/ci/test_python.sh
+++ b/ci/test_python.sh
@@ -23,8 +23,11 @@ CPP_CHANNEL=$(rapids-download-conda-from-s3 cpp)
 PYTHON_CHANNEL=$(rapids-download-conda-from-s3 python)
 
 LIBRMM_CHANNEL=$(rapids-get-pr-conda-artifact rmm 1095 cpp)
+RMM_CHANNEL=$(rapids-get-pr-conda-artifact rmm 1095 python)
 LIBCUDF_CHANNEL=$(rapids-get-pr-conda-artifact cudf 14365 cpp)
+CUDF_CHANNEL=$(rapids-get-pr-conda-artifact cudf 14365 python)
 LIBRAFT_CHANNEL=$(rapids-get-pr-conda-artifact raft 1964 cpp)
+RAFT_CHANNEL=$(rapids-get-pr-conda-artifact raft 1964 python)
 
 RAPIDS_TESTS_DIR=${RAPIDS_TESTS_DIR:-"${PWD}/test-results"}
 RAPIDS_COVERAGE_DIR=${RAPIDS_COVERAGE_DIR:-"${PWD}/coverage-results"}