From 0841ac4d027cc5f9394d4f06ef156fe886d79bfb Mon Sep 17 00:00:00 2001
From: Jordan Jacobelli <jjacobelli@nvidia.com>
Date: Tue, 1 Feb 2022 16:19:16 +0100
Subject: [PATCH] Build packages using mambabuild

Signed-off-by: Jordan Jacobelli <jjacobelli@nvidia.com>
---
 ci/cpu/build.sh | 13 ++++++++-----
 ci/gpu/build.sh |  4 ++--
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/ci/cpu/build.sh b/ci/cpu/build.sh
index 4d869afc1..72b72b3cd 100644
--- a/ci/cpu/build.sh
+++ b/ci/cpu/build.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-# Copyright (c) 2018-2021, NVIDIA CORPORATION.
+# Copyright (c) 2018-2022, NVIDIA CORPORATION.
 ######################################
 # cuSpatial CPU conda build script for CI #
 ######################################
@@ -68,6 +68,9 @@ conda list --show-channel-urls
 # FIX Added to deal with Anancoda SSL verification issues during conda builds
 conda config --set ssl_verify False
 
+# FIXME: Remove
+gpuci_mamba_retry install -c conda-forge boa
+
 ##########################################################################################
 # BUILD - Conda package builds (conda deps: libcupatial <- cuspatial)
 ##########################################################################################
@@ -75,9 +78,9 @@ conda config --set ssl_verify False
 if [ "$BUILD_LIBCUSPATIAL" == '1' ]; then
   gpuci_logger "Build conda pkg for libcuspatial"
   if [[ -z "$PROJECT_FLASH" || "$PROJECT_FLASH" == "0" ]]; then
-    gpuci_conda_retry build --no-build-id --croot ${CONDA_BLD_DIR} conda/recipes/libcuspatial
+    gpuci_conda_retry mambabuild --no-build-id --croot ${CONDA_BLD_DIR} conda/recipes/libcuspatial
   else
-    gpuci_conda_retry build --no-build-id --croot ${CONDA_BLD_DIR} --dirty --no-remove-work-dir conda/recipes/libcuspatial
+    gpuci_conda_retry mambabuild --no-build-id --croot ${CONDA_BLD_DIR} --dirty --no-remove-work-dir conda/recipes/libcuspatial
     mkdir -p ${CONDA_BLD_DIR}/libcuspatial/work
     cp -r ${CONDA_BLD_DIR}/work/* ${CONDA_BLD_DIR}/libcuspatial/work
   fi
@@ -86,9 +89,9 @@ fi
 if [ "$BUILD_CUSPATIAL" == '1' ]; then
   gpuci_logger "Build conda pkg for cuspatial"
   if [[ -z "$PROJECT_FLASH" || "$PROJECT_FLASH" == "0" ]]; then
-    gpuci_conda_retry build --croot ${CONDA_BLD_DIR} conda/recipes/cuspatial
+    gpuci_conda_retry mambabuild --croot ${CONDA_BLD_DIR} conda/recipes/cuspatial
   else
-    gpuci_conda_retry build --croot "$CONDA_BLD_DIR" --dirty --no-remove-work-dir \
+    gpuci_conda_retry mambabuild --croot "$CONDA_BLD_DIR" --dirty --no-remove-work-dir \
         -c "$WORKSPACE/ci/artifacts/cuspatial/cpu/.conda-bld/" conda/recipes/cuspatial
   fi
 fi
diff --git a/ci/gpu/build.sh b/ci/gpu/build.sh
index c66208b60..748b26e35 100644
--- a/ci/gpu/build.sh
+++ b/ci/gpu/build.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-# COPYRIGHT (c) 2020, NVIDIA CORPORATION.
+# COPYRIGHT (c) 2020-2022, NVIDIA CORPORATION.
 #########################################
 # cuSpatial GPU build and test script for CI #
 #########################################
@@ -135,7 +135,7 @@ else
     CONDA_FILE=`basename "$CONDA_FILE" .tar.bz2` #get filename without extension
     CONDA_FILE=${CONDA_FILE//-/=} #convert to conda install
     gpuci_logger "Installing $CONDA_FILE"
-    conda install -c "$CONDA_ARTIFACT_PATH" "$CONDA_FILE"
+    gpuci_mamba_retry install -c "$CONDA_ARTIFACT_PATH" "$CONDA_FILE"
 
     export LIBCUGRAPH_BUILD_DIR="$WORKSPACE/ci/artifacts/cuspatial/cpu/conda_work/build"