Remove verbose flag, run env update while in the base env

nv-morpheus · Jan 16, 2024 · 0aedcb4 · 0aedcb4
1 parent ceee83c
commit 0aedcb4
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 9 deletions.
diff --git a/ci/runner/Dockerfile b/ci/runner/Dockerfile
@@ -49,10 +49,8 @@ RUN rapids-dependency-file-generator \
       --output conda \
       --file_key build \
       --matrix "cuda=${CUDA_SHORT_VER};arch=${ARCH};py=${PYTHON_VER}" > /tmp/conda/env.yaml && \
-    CONDA_ALWAYS_YES=true /opt/conda/bin/mamba env create -n ${PROJ_NAME} -q --file /tmp/conda/env.yaml && \
-    sed -i "s/conda activate base/conda activate ${PROJ_NAME}/g" ~/.bashrc && \
-    conda clean -afy && \
-    rm -rf /tmp/conda
+    CONDA_ALWAYS_YES=true /opt/conda/bin/conda env create -n ${PROJ_NAME} -q --file /tmp/conda/env.yaml && \
+    sed -i "s/conda activate base/conda activate ${PROJ_NAME}/g" ~/.bashrc
 
 # ============ test ==================
 FROM base as test
@@ -76,10 +74,8 @@ RUN rapids-dependency-file-generator \
       --output conda \
       --file_key test \
       --matrix "cuda=${CUDA_SHORT_VER};arch=${ARCH};py=${PYTHON_VER}" > /tmp/conda/env.yaml && \
-    CONDA_ALWAYS_YES=true /opt/conda/bin/mamba env create -n ${PROJ_NAME} -q --file /tmp/conda/env.yaml && \
-    sed -i "s/conda activate base/conda activate ${PROJ_NAME}/g" ~/.bashrc && \
-    conda clean -afy && \
-    rm -rf /tmp/conda
+    CONDA_ALWAYS_YES=true /opt/conda/bin/conda env create -n ${PROJ_NAME} -q --file /tmp/conda/env.yaml && \
+    sed -i "s/conda activate base/conda activate ${PROJ_NAME}/g" ~/.bashrc
 
 COPY ./ci/scripts/download_kafka.py /tmp/scripts/download_kafka.py
 

diff --git a/ci/scripts/github/common.sh b/ci/scripts/github/common.sh
@@ -70,13 +70,14 @@ print_env_vars
 function update_conda_env() {
     # Deactivate the environment first before updating
     conda deactivate
+    conda activate base
 
 
     if [[ "${SKIP_CONDA_ENV_UPDATE}" == "" ]]; then
         rapids-logger "Checking for updates to conda env"
 
         # Update the packages
-        rapids-conda-retry env update -n morpheus --verbose --verbose --prune -q --file "$1"
+        rapids-conda-retry env update -n morpheus --prune -q --file "$1"
     fi
 
     # Finally, reactivate