From 3b5587e07aefc26b5c79bccea8286ab4acae21fd Mon Sep 17 00:00:00 2001
From: dillon-cullinan <dcullinan92@gmail.com>
Date: Wed, 3 Mar 2021 10:58:54 -0800
Subject: [PATCH 1/9] FIX Remove random build directory generation for ccache

---
 ci/cpu/build.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ci/cpu/build.sh b/ci/cpu/build.sh
index c9c2a37a4e9..205434036d7 100755
--- a/ci/cpu/build.sh
+++ b/ci/cpu/build.sh
@@ -68,10 +68,10 @@ fi
 
 if [ "$BUILD_LIBCUDF" == '1' ]; then
   gpuci_logger "Build conda pkg for libcudf"
-  gpuci_conda_retry build conda/recipes/libcudf $CONDA_BUILD_ARGS
+  gpuci_conda_retry build --no-build-id --croot ${WORKSPACE}/.conda-bld conda/recipes/libcudf $CONDA_BUILD_ARGS
 
   gpuci_logger "Build conda pkg for libcudf_kafka"
-  gpuci_conda_retry build conda/recipes/libcudf_kafka $CONDA_BUILD_ARGS
+  gpuci_conda_retry build --no-build-id --croot ${WORKSPACE}/.conda-bld conda/recipes/libcudf_kafka $CONDA_BUILD_ARGS
 fi
 
 if [ "$BUILD_CUDF" == '1' ]; then

From 1d5c333d934fbda75559f6e01f646265ad3960ba Mon Sep 17 00:00:00 2001
From: dillon-cullinan <dcullinan92@gmail.com>
Date: Wed, 3 Mar 2021 12:23:10 -0800
Subject: [PATCH 2/9] FIX Get correct file output location

---
 ci/cpu/upload.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ci/cpu/upload.sh b/ci/cpu/upload.sh
index 0465197e861..bd55a090b96 100755
--- a/ci/cpu/upload.sh
+++ b/ci/cpu/upload.sh
@@ -28,8 +28,8 @@ fi
 ################################################################################
 
 gpuci_logger "Get conda file output locations"
-export LIBCUDF_FILE=`conda build conda/recipes/libcudf --output`
-export LIBCUDF_KAFKA_FILE=`conda build conda/recipes/libcudf_kafka --output`
+export LIBCUDF_FILE=`conda build --no-build-id --croot ${WORKSPACE}/.conda-bld conda/recipes/libcudf --output`
+export LIBCUDF_KAFKA_FILE=`conda --no-build-id --croot ${WORKSPACE}/.conda-bld build conda/recipes/libcudf_kafka --output`
 export CUDF_FILE=`conda build conda/recipes/cudf --python=$PYTHON --output`
 export DASK_CUDF_FILE=`conda build conda/recipes/dask-cudf --python=$PYTHON --output`
 export CUDF_KAFKA_FILE=`conda build conda/recipes/cudf_kafka --python=$PYTHON --output`

From 8af337f65db7e6dafa7a9334e71597f6c1a8d84f Mon Sep 17 00:00:00 2001
From: dillon-cullinan <dcullinan92@gmail.com>
Date: Thu, 4 Mar 2021 10:24:35 -0800
Subject: [PATCH 3/9] FIX Separate build dirs for libs

---
 ci/cpu/build.sh  | 4 ++--
 ci/cpu/upload.sh | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/ci/cpu/build.sh b/ci/cpu/build.sh
index 205434036d7..67d87e04c87 100755
--- a/ci/cpu/build.sh
+++ b/ci/cpu/build.sh
@@ -68,10 +68,10 @@ fi
 
 if [ "$BUILD_LIBCUDF" == '1' ]; then
   gpuci_logger "Build conda pkg for libcudf"
-  gpuci_conda_retry build --no-build-id --croot ${WORKSPACE}/.conda-bld conda/recipes/libcudf $CONDA_BUILD_ARGS
+  gpuci_conda_retry build --no-build-id --croot ${WORKSPACE}/.conda-bld/libcudf conda/recipes/libcudf $CONDA_BUILD_ARGS
 
   gpuci_logger "Build conda pkg for libcudf_kafka"
-  gpuci_conda_retry build --no-build-id --croot ${WORKSPACE}/.conda-bld conda/recipes/libcudf_kafka $CONDA_BUILD_ARGS
+  gpuci_conda_retry build --no-build-id --croot ${WORKSPACE}/.conda-bld/libcudf_kafka conda/recipes/libcudf_kafka $CONDA_BUILD_ARGS
 fi
 
 if [ "$BUILD_CUDF" == '1' ]; then
diff --git a/ci/cpu/upload.sh b/ci/cpu/upload.sh
index bd55a090b96..8e88fe85fd8 100755
--- a/ci/cpu/upload.sh
+++ b/ci/cpu/upload.sh
@@ -28,8 +28,8 @@ fi
 ################################################################################
 
 gpuci_logger "Get conda file output locations"
-export LIBCUDF_FILE=`conda build --no-build-id --croot ${WORKSPACE}/.conda-bld conda/recipes/libcudf --output`
-export LIBCUDF_KAFKA_FILE=`conda --no-build-id --croot ${WORKSPACE}/.conda-bld build conda/recipes/libcudf_kafka --output`
+export LIBCUDF_FILE=`conda build --no-build-id --croot ${WORKSPACE}/.conda-bld/libcudf conda/recipes/libcudf --output`
+export LIBCUDF_KAFKA_FILE=`conda build --no-build-id --croot ${WORKSPACE}/.conda-bld/libcudf_kafka conda/recipes/libcudf_kafka --output`
 export CUDF_FILE=`conda build conda/recipes/cudf --python=$PYTHON --output`
 export DASK_CUDF_FILE=`conda build conda/recipes/dask-cudf --python=$PYTHON --output`
 export CUDF_KAFKA_FILE=`conda build conda/recipes/cudf_kafka --python=$PYTHON --output`

From 431d6ac06ea04c680ee2e36556e751b7c9af82da Mon Sep 17 00:00:00 2001
From: dillon-cullinan <dcullinan92@gmail.com>
Date: Fri, 5 Mar 2021 10:16:13 -0800
Subject: [PATCH 4/9] TST Test moving work dir

---
 ci/cpu/build.sh  | 7 +++++--
 ci/cpu/upload.sh | 4 ++--
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/ci/cpu/build.sh b/ci/cpu/build.sh
index 67d87e04c87..917c59cb7d7 100755
--- a/ci/cpu/build.sh
+++ b/ci/cpu/build.sh
@@ -68,10 +68,13 @@ fi
 
 if [ "$BUILD_LIBCUDF" == '1' ]; then
   gpuci_logger "Build conda pkg for libcudf"
-  gpuci_conda_retry build --no-build-id --croot ${WORKSPACE}/.conda-bld/libcudf conda/recipes/libcudf $CONDA_BUILD_ARGS
+  gpuci_conda_retry build --no-build-id --croot ${WORKSPACE}/.conda-bld conda/recipes/libcudf $CONDA_BUILD_ARGS
+  cp ${WORKSPACE}/.conda-bld/work ${WORKSPACE}/.conda-bld/libcudf/work
+
 
   gpuci_logger "Build conda pkg for libcudf_kafka"
-  gpuci_conda_retry build --no-build-id --croot ${WORKSPACE}/.conda-bld/libcudf_kafka conda/recipes/libcudf_kafka $CONDA_BUILD_ARGS
+  gpuci_conda_retry build --no-build-id --croot ${WORKSPACE}/.conda-bld conda/recipes/libcudf_kafka $CONDA_BUILD_ARGS
+  cp ${WORKSPACE}/.conda-bld/work ${WORKSPACE}/.conda-bld/libcudf_kafka/work
 fi
 
 if [ "$BUILD_CUDF" == '1' ]; then
diff --git a/ci/cpu/upload.sh b/ci/cpu/upload.sh
index 8e88fe85fd8..4a4a2bea14c 100755
--- a/ci/cpu/upload.sh
+++ b/ci/cpu/upload.sh
@@ -28,8 +28,8 @@ fi
 ################################################################################
 
 gpuci_logger "Get conda file output locations"
-export LIBCUDF_FILE=`conda build --no-build-id --croot ${WORKSPACE}/.conda-bld/libcudf conda/recipes/libcudf --output`
-export LIBCUDF_KAFKA_FILE=`conda build --no-build-id --croot ${WORKSPACE}/.conda-bld/libcudf_kafka conda/recipes/libcudf_kafka --output`
+export LIBCUDF_FILE=`conda build --no-build-id --croot ${WORKSPACE}/.conda-bld conda/recipes/libcudf --output`
+export LIBCUDF_KAFKA_FILE=`conda build --no-build-id --croot ${WORKSPACE}/.conda-bld conda/recipes/libcudf_kafka --output`
 export CUDF_FILE=`conda build conda/recipes/cudf --python=$PYTHON --output`
 export DASK_CUDF_FILE=`conda build conda/recipes/dask-cudf --python=$PYTHON --output`
 export CUDF_KAFKA_FILE=`conda build conda/recipes/cudf_kafka --python=$PYTHON --output`

From a1010dcf2bea38240024d833a59cf5f37a616968 Mon Sep 17 00:00:00 2001
From: dillon-cullinan <dcullinan92@gmail.com>
Date: Fri, 5 Mar 2021 11:47:42 -0800
Subject: [PATCH 5/9] TST Fix copy command

---
 ci/cpu/build.sh | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/ci/cpu/build.sh b/ci/cpu/build.sh
index 917c59cb7d7..fe7723e1c8e 100755
--- a/ci/cpu/build.sh
+++ b/ci/cpu/build.sh
@@ -69,12 +69,14 @@ fi
 if [ "$BUILD_LIBCUDF" == '1' ]; then
   gpuci_logger "Build conda pkg for libcudf"
   gpuci_conda_retry build --no-build-id --croot ${WORKSPACE}/.conda-bld conda/recipes/libcudf $CONDA_BUILD_ARGS
-  cp ${WORKSPACE}/.conda-bld/work ${WORKSPACE}/.conda-bld/libcudf/work
+  mkdir -p ${WORKSPACE}/.conda-bld/libcudf/work
+  cp -r ${WORKSPACE}/.conda-bld/work/* ${WORKSPACE}/.conda-bld/libcudf/work
 
 
   gpuci_logger "Build conda pkg for libcudf_kafka"
   gpuci_conda_retry build --no-build-id --croot ${WORKSPACE}/.conda-bld conda/recipes/libcudf_kafka $CONDA_BUILD_ARGS
-  cp ${WORKSPACE}/.conda-bld/work ${WORKSPACE}/.conda-bld/libcudf_kafka/work
+  mkdir -p ${WORKSPACE}/.conda-bld/libcudf_kafka/work
+  cp -r ${WORKSPACE}/.conda-bld/work/* ${WORKSPACE}/.conda-bld/libcudf_kafka/work
 fi
 
 if [ "$BUILD_CUDF" == '1' ]; then

From c823707eee1e5a3745bf7afc5eb27db993a52b4e Mon Sep 17 00:00:00 2001
From: dillon-cullinan <dcullinan92@gmail.com>
Date: Fri, 5 Mar 2021 16:52:34 -0800
Subject: [PATCH 6/9] FIX Keep conda build dir consistent across all packages

---
 ci/cpu/build.sh  | 23 ++++++++++++-----------
 ci/cpu/upload.sh |  8 ++++----
 2 files changed, 16 insertions(+), 15 deletions(-)

diff --git a/ci/cpu/build.sh b/ci/cpu/build.sh
index fe7723e1c8e..bbf4ec89fcc 100755
--- a/ci/cpu/build.sh
+++ b/ci/cpu/build.sh
@@ -19,8 +19,9 @@ export CUDA_REL=${CUDA_VERSION%.*}
 export GPUCI_CONDA_RETRY_MAX=1
 export GPUCI_CONDA_RETRY_SLEEP=30
 
-# Use Ninja to build
+# Use Ninja to build, setup Conda Build Dir
 export CMAKE_GENERATOR="Ninja"
+export CONDA_BLD_DIR="${WORKSPACE}/.conda-bld"
 
 # Switch to project root; also root of repo checkout
 cd $WORKSPACE
@@ -68,29 +69,29 @@ fi
 
 if [ "$BUILD_LIBCUDF" == '1' ]; then
   gpuci_logger "Build conda pkg for libcudf"
-  gpuci_conda_retry build --no-build-id --croot ${WORKSPACE}/.conda-bld conda/recipes/libcudf $CONDA_BUILD_ARGS
-  mkdir -p ${WORKSPACE}/.conda-bld/libcudf/work
-  cp -r ${WORKSPACE}/.conda-bld/work/* ${WORKSPACE}/.conda-bld/libcudf/work
+  gpuci_conda_retry build --no-build-id --croot ${CONDA_BLD_DIR} conda/recipes/libcudf $CONDA_BUILD_ARGS
+  mkdir -p ${CONDA_BLD_DIR}/libcudf/work
+  cp -r ${CONDA_BLD_DIR}/work/* ${CONDA_BLD_DIR}/libcudf/work
 
 
   gpuci_logger "Build conda pkg for libcudf_kafka"
-  gpuci_conda_retry build --no-build-id --croot ${WORKSPACE}/.conda-bld conda/recipes/libcudf_kafka $CONDA_BUILD_ARGS
-  mkdir -p ${WORKSPACE}/.conda-bld/libcudf_kafka/work
-  cp -r ${WORKSPACE}/.conda-bld/work/* ${WORKSPACE}/.conda-bld/libcudf_kafka/work
+  gpuci_conda_retry build --no-build-id --croot ${CONDA_BLD_DIR} conda/recipes/libcudf_kafka $CONDA_BUILD_ARGS
+  mkdir -p ${CONDA_BLD_DIR}/libcudf_kafka/work
+  cp -r ${CONDA_BLD_DIR}/work/* ${CONDA_BLD_DIR}/libcudf_kafka/work
 fi
 
 if [ "$BUILD_CUDF" == '1' ]; then
   gpuci_logger "Build conda pkg for cudf"
-  gpuci_conda_retry build conda/recipes/cudf --python=$PYTHON $CONDA_BUILD_ARGS $CONDA_CHANNEL
+  gpuci_conda_retry build --croot ${CONDA_BLD_DIR} conda/recipes/cudf --python=$PYTHON $CONDA_BUILD_ARGS $CONDA_CHANNEL
 
   gpuci_logger "Build conda pkg for dask-cudf"
-  gpuci_conda_retry build conda/recipes/dask-cudf --python=$PYTHON $CONDA_BUILD_ARGS $CONDA_CHANNEL
+  gpuci_conda_retry build --croot ${CONDA_BLD_DIR} conda/recipes/dask-cudf --python=$PYTHON $CONDA_BUILD_ARGS $CONDA_CHANNEL
 
   gpuci_logger "Build conda pkg for cudf_kafka"
-  gpuci_conda_retry build conda/recipes/cudf_kafka --python=$PYTHON $CONDA_BUILD_ARGS $CONDA_CHANNEL
+  gpuci_conda_retry build --croot ${CONDA_BLD_DIR} conda/recipes/cudf_kafka --python=$PYTHON $CONDA_BUILD_ARGS $CONDA_CHANNEL
 
   gpuci_logger "Build conda pkg for custreamz"
-  gpuci_conda_retry build conda/recipes/custreamz --python=$PYTHON $CONDA_BUILD_ARGS $CONDA_CHANNEL
+  gpuci_conda_retry build --croot ${CONDA_BLD_DIR} conda/recipes/custreamz --python=$PYTHON $CONDA_BUILD_ARGS $CONDA_CHANNEL
 fi
 ################################################################################
 # UPLOAD - Conda packages
diff --git a/ci/cpu/upload.sh b/ci/cpu/upload.sh
index 4a4a2bea14c..ca8ee1d75ac 100755
--- a/ci/cpu/upload.sh
+++ b/ci/cpu/upload.sh
@@ -30,10 +30,10 @@ fi
 gpuci_logger "Get conda file output locations"
 export LIBCUDF_FILE=`conda build --no-build-id --croot ${WORKSPACE}/.conda-bld conda/recipes/libcudf --output`
 export LIBCUDF_KAFKA_FILE=`conda build --no-build-id --croot ${WORKSPACE}/.conda-bld conda/recipes/libcudf_kafka --output`
-export CUDF_FILE=`conda build conda/recipes/cudf --python=$PYTHON --output`
-export DASK_CUDF_FILE=`conda build conda/recipes/dask-cudf --python=$PYTHON --output`
-export CUDF_KAFKA_FILE=`conda build conda/recipes/cudf_kafka --python=$PYTHON --output`
-export CUSTREAMZ_FILE=`conda build conda/recipes/custreamz --python=$PYTHON --output`
+export CUDF_FILE=`conda build --croot ${CONDA_BLD_DIR} conda/recipes/cudf --python=$PYTHON --output`
+export DASK_CUDF_FILE=`conda build --croot ${CONDA_BLD_DIR} conda/recipes/dask-cudf --python=$PYTHON --output`
+export CUDF_KAFKA_FILE=`conda build --croot ${CONDA_BLD_DIR} conda/recipes/cudf_kafka --python=$PYTHON --output`
+export CUSTREAMZ_FILE=`conda build --croot ${CONDA_BLD_DIR} conda/recipes/custreamz --python=$PYTHON --output`
 
 ################################################################################
 # UPLOAD - Conda packages

From 44439a9a7c96a3af4e68a2fd412c561ac59f710a Mon Sep 17 00:00:00 2001
From: dillon-cullinan <dcullinan92@gmail.com>
Date: Fri, 5 Mar 2021 19:06:20 -0800
Subject: [PATCH 7/9] FIX Handle artifact directory changing based off conda
 build dir

---
 ci/cpu/build.sh | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/ci/cpu/build.sh b/ci/cpu/build.sh
index bbf4ec89fcc..ecb093fe92d 100755
--- a/ci/cpu/build.sh
+++ b/ci/cpu/build.sh
@@ -64,7 +64,11 @@ if [[ -z "$PROJECT_FLASH" || "$PROJECT_FLASH" == "0" ]]; then
   CONDA_CHANNEL=""
 else
   CONDA_BUILD_ARGS="--dirty --no-remove-work-dir"
-  CONDA_CHANNEL="-c $WORKSPACE/ci/artifacts/cudf/cpu/conda-bld/"
+  if [[ ${CONDA_BLD_DIR} == "${WORKSPACE}/.conda-bld" ]]; then
+    CONDA_CHANNEL="-c $WORKSPACE/ci/artifacts/cudf/cpu/.conda-bld/"
+  else
+    CONDA_CHANNEL="-c $WORKSPACE/ci/artifacts/cudf/cpu/conda-bld/"
+  fi
 fi
 
 if [ "$BUILD_LIBCUDF" == '1' ]; then

From 3369730f16cfb07c72d8f6eb13beb75a29a63583 Mon Sep 17 00:00:00 2001
From: dillon-cullinan <dcullinan92@gmail.com>
Date: Fri, 5 Mar 2021 21:41:15 -0800
Subject: [PATCH 8/9] FIX Define artifact directory in GPU build

---
 ci/gpu/build.sh | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/ci/gpu/build.sh b/ci/gpu/build.sh
index 917a2b4cf27..316f9c5f98a 100755
--- a/ci/gpu/build.sh
+++ b/ci/gpu/build.sh
@@ -24,6 +24,7 @@ cd $WORKSPACE
 
 # Determine CUDA release version
 export CUDA_REL=${CUDA_VERSION%.*}
+export CONDA_ARTIFACT_PATH=${WORKSPACE}/ci/artifacts/cudf/cpu/.conda-bld/
 
 # Parse git describe
 export GIT_DESCRIBE_TAG=`git describe --tags`
@@ -170,15 +171,15 @@ else
         ${gt} --gtest_output=xml:${WORKSPACE}/test-results/
     done
 
-    CUDF_CONDA_FILE=`find $WORKSPACE/ci/artifacts/cudf/cpu/conda-bld/ -name "libcudf-*.tar.bz2"`
+    CUDF_CONDA_FILE=`find ${CONDA_ARTIFACT_PATH} -name "libcudf-*.tar.bz2"`
     CUDF_CONDA_FILE=`basename "$CUDF_CONDA_FILE" .tar.bz2` #get filename without extension
     CUDF_CONDA_FILE=${CUDF_CONDA_FILE//-/=} #convert to conda install
-    KAFKA_CONDA_FILE=`find $WORKSPACE/ci/artifacts/cudf/cpu/conda-bld/ -name "libcudf_kafka-*.tar.bz2"`
+    KAFKA_CONDA_FILE=`find ${CONDA_ARTIFACT_PATH} -name "libcudf_kafka-*.tar.bz2"`
     KAFKA_CONDA_FILE=`basename "$KAFKA_CONDA_FILE" .tar.bz2` #get filename without extension
     KAFKA_CONDA_FILE=${KAFKA_CONDA_FILE//-/=} #convert to conda install
 
     gpuci_logger "Installing $CUDF_CONDA_FILE & $KAFKA_CONDA_FILE"
-    conda install -c $WORKSPACE/ci/artifacts/cudf/cpu/conda-bld/ "$CUDF_CONDA_FILE" "$KAFKA_CONDA_FILE"
+    conda install -c ${CONDA_ARTIFACT_PATH} "$CUDF_CONDA_FILE" "$KAFKA_CONDA_FILE"
 
     install_dask
 

From d13cbaf80548560f10f7210d039116be06e8ee69 Mon Sep 17 00:00:00 2001
From: dillon-cullinan <dcullinan92@gmail.com>
Date: Fri, 5 Mar 2021 21:47:56 -0800
Subject: [PATCH 9/9] FIX Remove unnecessary if block

---
 ci/cpu/build.sh | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/ci/cpu/build.sh b/ci/cpu/build.sh
index ecb093fe92d..588debc40db 100755
--- a/ci/cpu/build.sh
+++ b/ci/cpu/build.sh
@@ -64,11 +64,7 @@ if [[ -z "$PROJECT_FLASH" || "$PROJECT_FLASH" == "0" ]]; then
   CONDA_CHANNEL=""
 else
   CONDA_BUILD_ARGS="--dirty --no-remove-work-dir"
-  if [[ ${CONDA_BLD_DIR} == "${WORKSPACE}/.conda-bld" ]]; then
-    CONDA_CHANNEL="-c $WORKSPACE/ci/artifacts/cudf/cpu/.conda-bld/"
-  else
-    CONDA_CHANNEL="-c $WORKSPACE/ci/artifacts/cudf/cpu/conda-bld/"
-  fi
+  CONDA_CHANNEL="-c $WORKSPACE/ci/artifacts/cudf/cpu/.conda-bld/"
 fi
 
 if [ "$BUILD_LIBCUDF" == '1' ]; then