From 6c93a0a9ae2528593c4b2b224c2f72c29b007733 Mon Sep 17 00:00:00 2001
From: AJ Schmidt <aschmidt@nvidia.com>
Date: Thu, 8 Jul 2021 13:53:59 -0400
Subject: [PATCH 1/2] use rapids conda env

---
 templates/ci/checks/style.sh | 3 ++-
 templates/ci/cpu/cpubuild.sh | 3 ++-
 templates/ci/gpu/gpubuild.sh | 3 ++-
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/templates/ci/checks/style.sh b/templates/ci/checks/style.sh
index 1f470c21..861e4371 100644
--- a/templates/ci/checks/style.sh
+++ b/templates/ci/checks/style.sh
@@ -14,7 +14,8 @@ LC_ALL=C.UTF-8
 LANG=C.UTF-8
 
 # Activate common conda env
-source activate gdf
+. /opt/conda/etc/profile.d/conda.sh
+conda activate rapids
 
 # Run isort and get results/return code
 ISORT=`isort --recursive --check-only python`
diff --git a/templates/ci/cpu/cpubuild.sh b/templates/ci/cpu/cpubuild.sh
index 26123628..8b762d53 100644
--- a/templates/ci/cpu/cpubuild.sh
+++ b/templates/ci/cpu/cpubuild.sh
@@ -43,7 +43,8 @@ logger "Get env..."
 env
 
 logger "Activate conda env..."
-source activate gdf
+. /opt/conda/etc/profile.d/conda.sh
+conda activate rapids
 
 logger "Check versions..."
 python --version
diff --git a/templates/ci/gpu/gpubuild.sh b/templates/ci/gpu/gpubuild.sh
index 68dc5c5c..e2e8468a 100644
--- a/templates/ci/gpu/gpubuild.sh
+++ b/templates/ci/gpu/gpubuild.sh
@@ -44,7 +44,8 @@ logger "Check GPU usage..."
 nvidia-smi
 
 logger "Activate conda env..."
-source activate gdf
+. /opt/conda/etc/profile.d/conda.sh
+conda activate rapids
 ##*
 ## EDIT: Install all build, runtime, and test dependencies
 conda install |<build_dep>| |<runtime_dep>| |<test_dep>|

From 885edecd601c4c1b58de3c3192b044ed07a7c2cb Mon Sep 17 00:00:00 2001
From: AJ Schmidt <aschmidt@nvidia.com>
Date: Thu, 8 Jul 2021 13:58:38 -0400
Subject: [PATCH 2/2] rm gdf symlink

---
 rapidsai-l4t/Dockerfile          | 3 ---
 rapidsai/base-runtime.Dockerfile | 3 ---
 rapidsai/devel-centos.Dockerfile | 3 ---
 rapidsai/devel.Dockerfile        | 3 ---
 4 files changed, 12 deletions(-)

diff --git a/rapidsai-l4t/Dockerfile b/rapidsai-l4t/Dockerfile
index 804c195f..cd0e07dc 100644
--- a/rapidsai-l4t/Dockerfile
+++ b/rapidsai-l4t/Dockerfile
@@ -113,9 +113,6 @@ RUN gpuci_conda_retry create --no-default-packages --override-channels -n rapids
       "setuptools<50" \
     && sed -i 's/conda activate base/conda activate rapids/g' ~/.bashrc
 
-# Create symlink for old scripts expecting `gdf` conda env
-RUN ln -s /opt/conda/envs/rapids /opt/conda/envs/gdf
-
 # Clean up pkgs to reduce image size and chmod for all users
 RUN chmod -R ugo+w /opt/conda \
     && conda clean -tipy \
diff --git a/rapidsai/base-runtime.Dockerfile b/rapidsai/base-runtime.Dockerfile
index 14e0b6e7..5ee2a2f0 100644
--- a/rapidsai/base-runtime.Dockerfile
+++ b/rapidsai/base-runtime.Dockerfile
@@ -61,9 +61,6 @@ RUN gpuci_conda_retry create --no-default-packages --override-channels -n rapids
       "setuptools<50" \
     && sed -i 's/conda activate base/conda activate rapids/g' ~/.bashrc
 
-# Create symlink for old scripts expecting `gdf` conda env
-RUN ln -s /opt/conda/envs/rapids /opt/conda/envs/gdf
-
 # For `runtime` images install notebook env meta-pkg
 #
 # Once installed remove the meta-pkg so dependencies can be freely updated &
diff --git a/rapidsai/devel-centos.Dockerfile b/rapidsai/devel-centos.Dockerfile
index 5e8acf24..b6ef96ed 100644
--- a/rapidsai/devel-centos.Dockerfile
+++ b/rapidsai/devel-centos.Dockerfile
@@ -97,9 +97,6 @@ RUN gpuci_conda_retry create --no-default-packages --override-channels -n rapids
       "setuptools<50" \
     && sed -i 's/conda activate base/conda activate rapids/g' ~/.bashrc
 
-# Create symlink for old scripts expecting `gdf` conda env
-RUN ln -s /opt/conda/envs/rapids /opt/conda/envs/gdf
-
 # Install build/doc/notebook env meta-pkgs
 #
 # Once installed remove the meta-pkg so dependencies can be freely updated &
diff --git a/rapidsai/devel.Dockerfile b/rapidsai/devel.Dockerfile
index 5b3462d7..35eea487 100644
--- a/rapidsai/devel.Dockerfile
+++ b/rapidsai/devel.Dockerfile
@@ -111,9 +111,6 @@ RUN gpuci_conda_retry create --no-default-packages --override-channels -n rapids
       "setuptools<50" \
     && sed -i 's/conda activate base/conda activate rapids/g' ~/.bashrc
 
-# Create symlink for old scripts expecting `gdf` conda env
-RUN ln -s /opt/conda/envs/rapids /opt/conda/envs/gdf
-
 # Install build/doc/notebook env meta-pkgs
 #
 # Once installed remove the meta-pkg so dependencies can be freely updated &