diff --git a/jenkins/Dockerfile-blossom.integration.rocky b/jenkins/Dockerfile-blossom.integration.rocky index b293bba640f..5dbe24c9d17 100644 --- a/jenkins/Dockerfile-blossom.integration.rocky +++ b/jenkins/Dockerfile-blossom.integration.rocky @@ -45,17 +45,16 @@ RUN wget --quiet https://repo.anaconda.com/miniconda/Miniconda3-latest-Linux-x86 /bin/bash ~/miniconda.sh -b -p /opt/conda && \ rm -f ~/miniconda.sh ENV PATH="/opt/conda/bin:$MAVEN_HOME/bin:${PATH}" -RUN conda init -# TODO: re-enable mamba solver after https://github.com/NVIDIA/spark-rapids/issues/9393 -# conda config --set solver libmamba +RUN conda init && conda install -n base -c conda-forge mamba # 'pyarrow' and 'pandas' will be installed as the dependencies of cudf below RUN export CUDA_VER=`echo ${CUDA_VER} | cut -d '.' -f 1,2` && \ - conda install -y -c rapidsai -c rapidsai-nightly -c nvidia -c conda-forge -c defaults cudf=${CUDF_VER} python=3.10 cuda-version=${CUDA_VER} && \ - conda install -y spacy && python -m spacy download en_core_web_sm && \ - conda install -y -c anaconda pytest requests && \ - conda install -y -c conda-forge sre_yield && \ - conda clean -ay + mamba install -y -c rapidsai -c rapidsai-nightly -c nvidia -c conda-forge -c defaults \ + cudf=${CUDF_VER} python=3.10 cuda-version=${CUDA_VER} && \ + mamba install -y spacy && python -m spacy download en_core_web_sm && \ + mamba install -y -c anaconda pytest requests && \ + mamba install -y -c conda-forge sre_yield && \ + mamba clean -ay # install pytest plugins for xdist parallel run RUN python -m pip install findspark pytest-xdist pytest-order fastparquet==2024.5.0 diff --git a/jenkins/Dockerfile-blossom.integration.ubuntu b/jenkins/Dockerfile-blossom.integration.ubuntu index b33309881e8..bd9c048a716 100644 --- a/jenkins/Dockerfile-blossom.integration.ubuntu +++ b/jenkins/Dockerfile-blossom.integration.ubuntu @@ -57,17 +57,16 @@ RUN wget --quiet https://repo.anaconda.com/miniconda/Miniconda3-latest-Linux-x86 /bin/bash ~/miniconda.sh -b -p /opt/conda && \ rm -f ~/miniconda.sh ENV PATH="/opt/conda/bin:$MAVEN_HOME/bin:${PATH}" -RUN conda init -# TODO: re-enable mamba solver after https://github.com/NVIDIA/spark-rapids/issues/9393 -# conda config --set solver libmamba +RUN conda init && conda install -n base -c conda-forge mamba # 'pyarrow' and 'pandas' will be installed as the dependencies of cudf below RUN export CUDA_VER=`echo ${CUDA_VER} | cut -d '.' -f 1,2` && \ - conda install -y -c rapidsai -c rapidsai-nightly -c nvidia -c conda-forge -c defaults cudf=${CUDF_VER} python=3.10 cuda-version=${CUDA_VER} && \ - conda install -y spacy && python -m spacy download en_core_web_sm && \ - conda install -y -c anaconda pytest requests && \ - conda install -y -c conda-forge sre_yield && \ - conda clean -ay + mamba install -y -c rapidsai -c rapidsai-nightly -c nvidia -c conda-forge -c defaults \ + cudf=${CUDF_VER} python=3.10 cuda-version=${CUDA_VER} && \ + mamba install -y spacy && python -m spacy download en_core_web_sm && \ + mamba install -y -c anaconda pytest requests && \ + mamba install -y -c conda-forge sre_yield && \ + mamba clean -ay # install pytest plugins for xdist parallel run RUN python -m pip install findspark pytest-xdist pytest-order fastparquet==2024.5.0