From d7edcda93de0ecbd97058002bc37bf9a141004e1 Mon Sep 17 00:00:00 2001 From: pintaoz-aws Date: Thu, 3 Oct 2024 15:24:33 -0700 Subject: [PATCH 1/2] Use Miniforge to replace MambaForge --- tests/integ/sagemaker/conftest.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/tests/integ/sagemaker/conftest.py b/tests/integ/sagemaker/conftest.py index a5ba724339..35b9c5b0b2 100644 --- a/tests/integ/sagemaker/conftest.py +++ b/tests/integ/sagemaker/conftest.py @@ -46,8 +46,8 @@ 'SHELL ["/bin/bash", "-c"]\n' "RUN apt-get update -y \ && apt-get install -y unzip curl\n\n" - "RUN curl -L -O 'https://github.com/conda-forge/miniforge/releases/latest/download/Mambaforge-Linux-x86_64.sh' \ - && bash Mambaforge-Linux-x86_64.sh -b -p '/opt/conda' \ + "RUN curl -L -O 'https://github.com/conda-forge/miniforge/releases/latest/download/Miniforge3-$(uname)-$(uname -m).sh' \ + && bash Miniforge3-$(uname)-$(uname -m).sh -b -p '/opt/conda' \ && /opt/conda/bin/conda init bash\n\n" "ENV PATH $PATH:/opt/conda/bin\n" "RUN mamba create -n integ_test_env python={py_version} -y \ @@ -86,8 +86,8 @@ 'SHELL ["/bin/bash", "-c"]\n' "RUN apt-get update -y \ && apt-get install -y unzip curl\n\n" - "RUN curl -L -O 'https://github.com/conda-forge/miniforge/releases/latest/download/Mambaforge-Linux-x86_64.sh' \ - && bash Mambaforge-Linux-x86_64.sh -b -p '/opt/conda' \ + "RUN curl -L -O 'https://github.com/conda-forge/miniforge/releases/latest/download/Miniforge3-$(uname)-$(uname -m).sh' \ + && bash Miniforge3-$(uname)-$(uname -m).sh -b -p '/opt/conda' \ && /opt/conda/bin/conda init bash\n\n" "ENV PATH $PATH:/opt/conda/bin\n" "COPY {source_archive} ./\n" From f9b84e0e8bb0932e70270a32476ae30e4790a2ef Mon Sep 17 00:00:00 2001 From: pintaoz-aws Date: Thu, 3 Oct 2024 16:29:49 -0700 Subject: [PATCH 2/2] Fix download url --- tests/integ/sagemaker/conftest.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/tests/integ/sagemaker/conftest.py b/tests/integ/sagemaker/conftest.py index 35b9c5b0b2..a0a60fc334 100644 --- a/tests/integ/sagemaker/conftest.py +++ b/tests/integ/sagemaker/conftest.py @@ -46,8 +46,8 @@ 'SHELL ["/bin/bash", "-c"]\n' "RUN apt-get update -y \ && apt-get install -y unzip curl\n\n" - "RUN curl -L -O 'https://github.com/conda-forge/miniforge/releases/latest/download/Miniforge3-$(uname)-$(uname -m).sh' \ - && bash Miniforge3-$(uname)-$(uname -m).sh -b -p '/opt/conda' \ + "RUN curl -L -O 'https://github.com/conda-forge/miniforge/releases/latest/download/Miniforge3-Linux-x86_64.sh' \ + && bash Miniforge3-Linux-x86_64.sh -b -p '/opt/conda' \ && /opt/conda/bin/conda init bash\n\n" "ENV PATH $PATH:/opt/conda/bin\n" "RUN mamba create -n integ_test_env python={py_version} -y \ @@ -86,8 +86,8 @@ 'SHELL ["/bin/bash", "-c"]\n' "RUN apt-get update -y \ && apt-get install -y unzip curl\n\n" - "RUN curl -L -O 'https://github.com/conda-forge/miniforge/releases/latest/download/Miniforge3-$(uname)-$(uname -m).sh' \ - && bash Miniforge3-$(uname)-$(uname -m).sh -b -p '/opt/conda' \ + "RUN curl -L -O 'https://github.com/conda-forge/miniforge/releases/latest/download/Miniforge3-Linux-x86_64.sh' \ + && bash Miniforge3-Miniforge3-Linux-x86_64.sh -b -p '/opt/conda' \ && /opt/conda/bin/conda init bash\n\n" "ENV PATH $PATH:/opt/conda/bin\n" "COPY {source_archive} ./\n"