From 990d8c55f295fd63eadbb80b2cef26fc625d0f78 Mon Sep 17 00:00:00 2001
From: Kyle Edwards <kyedwards@nvidia.com>
Date: Fri, 14 Feb 2025 13:59:01 -0500
Subject: [PATCH] Consolidate more Conda solves in CI

Issue: https://github.com/rapidsai/build-planning/issues/22
---
 ci/test_java.sh   | 16 +++++++---------
 dependencies.yaml |  1 +
 2 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/ci/test_java.sh b/ci/test_java.sh
index e473dd6915..05c4e3346d 100755
--- a/ci/test_java.sh
+++ b/ci/test_java.sh
@@ -1,15 +1,20 @@
 #!/bin/bash
-# Copyright (c) 2024, NVIDIA CORPORATION.
+# Copyright (c) 2024-2025, NVIDIA CORPORATION.
 
 set -euo pipefail
 
 . /opt/conda/etc/profile.d/conda.sh
 
+rapids-logger "Downloading artifacts from previous jobs"
+CPP_CHANNEL=$(rapids-download-conda-from-s3 cpp)
+
 rapids-logger "Generate java testing dependencies"
 rapids-dependency-file-generator \
   --output conda \
   --file-key test_java \
-  --matrix "cuda=${RAPIDS_CUDA_VERSION%.*};arch=$(arch)" | tee env.yaml
+  --matrix "cuda=${RAPIDS_CUDA_VERSION%.*};arch=$(arch)" \
+  --prepend-channel "${CPP_CHANNEL}" \
+  | tee env.yaml
 
 rapids-mamba-retry env create --yes -f env.yaml -n test
 
@@ -18,15 +23,8 @@ set +u
 conda activate test
 set -u
 
-rapids-logger "Downloading artifacts from previous jobs"
-CPP_CHANNEL=$(rapids-download-conda-from-s3 cpp)
-
 rapids-print-env
 
-rapids-mamba-retry install \
-  --channel "${CPP_CHANNEL}" \
-  libkvikio
-
 rapids-logger "Check GPU usage"
 nvidia-smi
 
diff --git a/dependencies.yaml b/dependencies.yaml
index be30907dff..f855576305 100644
--- a/dependencies.yaml
+++ b/dependencies.yaml
@@ -104,6 +104,7 @@ files:
       - cuda_version
       - cuda
       - test_java
+      - depends_on_libkvikio
 channels:
   - rapidsai
   - rapidsai-nightly