Fix maven multi url issues and update awscli==1.32.17 to support PyYA…

…ML 6.0.1 in ppc64le (#4340) Signed-off-by: Peter Zhu <[email protected]>
opensearch-project · Jan 12, 2024 · 4193896 · 4193896
1 parent 773603b
commit 4193896
Show file tree

Hide file tree

Showing 9 changed files with 12 additions and 12 deletions.
diff --git a/docker/ci/dockerfiles/current/build.centos7.opensearch.x64.arm64.dockerfile b/docker/ci/dockerfiles/current/build.centos7.opensearch.x64.arm64.dockerfile
@@ -48,7 +48,7 @@ COPY --chown=0:0 config/jdk-setup.sh config/yq-setup.sh /tmp/
 RUN /tmp/jdk-setup.sh && /tmp/yq-setup.sh
 
 # Install higher version of maven 3.8.x
-RUN export MAVEN_URL=`curl -s https://maven.apache.org/download.cgi | grep -Eo '["\047].*.bin.tar.gz["\047]' | tr -d '"'`  && \
+RUN export MAVEN_URL=`curl -s https://maven.apache.org/download.cgi | grep -Eo '["\047].*.bin.tar.gz["\047]' | tr -d '"' | uniq | head -n 1`  && \
     mkdir -p $MAVEN_DIR && (curl -s $MAVEN_URL | tar xzf - --strip-components=1 -C $MAVEN_DIR) && \
     echo "export M2_HOME=$MAVEN_DIR" > /etc/profile.d/maven_path.sh && \
     echo "export M2=\$M2_HOME/bin" >> /etc/profile.d/maven_path.sh && \
@@ -87,7 +87,7 @@ RUN ln -sfn /usr/local/bin/python3.9 /usr/bin/python3 && \
     ln -sfn /usr/local/bin/pip3.9 /usr/bin/pip && \
     ln -sfn /usr/local/bin/pip3.9 /usr/local/bin/pip && \
     ln -sfn /usr/local/bin/pip3.9 /usr/bin/pip3 && \
-    pip3 install pip==23.1.2 && pip3 install pipenv==2023.6.12 awscli==1.22.12
+    pip3 install pip==23.1.2 && pip3 install pipenv==2023.6.12 awscli==1.32.17
 
 # Add k-NN Library dependencies
 RUN yum install epel-release -y && yum repolist && yum install openblas-static lapack gcc-gfortran -y

diff --git a/docker/ci/dockerfiles/current/build.rockylinux8.opensearch-dashboards.x64.arm64.dockerfile b/docker/ci/dockerfiles/current/build.rockylinux8.opensearch-dashboards.x64.arm64.dockerfile
@@ -69,7 +69,7 @@ ENV PATH=$RUBY_HOME:$RVM_HOME:$PATH
 # Install Python binary
 RUN update-alternatives --set python /usr/bin/python3.9 && \
     update-alternatives --set python3 /usr/bin/python3.9 && \
-    pip3 install pip==23.1.2 && pip3 install pipenv==2023.6.12 awscli==1.22.12
+    pip3 install pip==23.1.2 && pip3 install pipenv==2023.6.12 awscli==1.32.17
 
 # Preparation for awscliv2
 #RUN pip3 install git+https://github.com/aws/[email protected]

diff --git a/docker/ci/dockerfiles/current/build.rockylinux8.opensearch.x64.arm64.dockerfile b/docker/ci/dockerfiles/current/build.rockylinux8.opensearch.x64.arm64.dockerfile
@@ -47,7 +47,7 @@ COPY --chown=0:0 config/jdk-setup.sh config/yq-setup.sh /tmp/
 RUN /tmp/jdk-setup.sh && /tmp/yq-setup.sh
 
 # Install higher version of maven 3.8.x
-RUN export MAVEN_URL=`curl -s https://maven.apache.org/download.cgi | grep -Eo '["\047].*.bin.tar.gz["\047]' | tr -d '"'`  && \
+RUN export MAVEN_URL=`curl -s https://maven.apache.org/download.cgi | grep -Eo '["\047].*.bin.tar.gz["\047]' | tr -d '"' | uniq | head -n 1`  && \
     mkdir -p $MAVEN_DIR && (curl -s $MAVEN_URL | tar xzf - --strip-components=1 -C $MAVEN_DIR) && \
     echo "export M2_HOME=$MAVEN_DIR" > /etc/profile.d/maven_path.sh && \
     echo "export M2=\$M2_HOME/bin" >> /etc/profile.d/maven_path.sh && \
@@ -78,7 +78,7 @@ ENV PATH=$RUBY_HOME:$RVM_HOME:$PATH
 # Install Python binary
 RUN update-alternatives --set python /usr/bin/python3.9 && \
     update-alternatives --set python3 /usr/bin/python3.9 && \
-    pip3 install pip==23.1.2 && pip3 install pipenv==2023.6.12 awscli==1.22.12
+    pip3 install pip==23.1.2 && pip3 install pipenv==2023.6.12 awscli==1.32.17
 
 # Add k-NN Library dependencies
 # EL8 requires install config-manager and enable powertools to consume openblas-static

diff --git a/docker/ci/dockerfiles/current/build.ubuntu2004.opensearch.x64.arm64.dockerfile b/docker/ci/dockerfiles/current/build.ubuntu2004.opensearch.x64.arm64.dockerfile
@@ -33,7 +33,7 @@ RUN apt-get update -y && apt-get upgrade -y && apt-get install -y docker.io curl
 
 # Install pip packages
 RUN curl -SL https://bootstrap.pypa.io/get-pip.py | python && \
-    pip3 install pip==23.1.2 && pip3 install pipenv==2023.6.12 awscli==1.22.12 docker-compose==1.29.2
+    pip3 install pip==23.1.2 && pip3 install pipenv==2023.6.12 awscli==1.32.17 docker-compose==1.29.2
 
 # Install aptly and required changes to debmake
 # Remove lintian for now due to it takes nearly 20 minutes for OpenSearch as well as nearly an hour for OpenSearch-Dashboards during debmake

diff --git a/docker/ci/dockerfiles/current/docker-builder.ubuntu2004.x64.dockerfile b/docker/ci/dockerfiles/current/docker-builder.ubuntu2004.x64.dockerfile
@@ -26,7 +26,7 @@ RUN apt-get update -y && apt-get install -y software-properties-common && add-ap
 # Install necessary packages
 RUN apt-get update -y && apt-get upgrade -y && apt-get install -y binfmt-support qemu qemu-user qemu-user-static docker.io curl python3-pip && \
     apt-get install -y debmake debhelper-compat && \
-    apt-get clean -y && pip3 install awscli==1.22.12
+    apt-get clean -y && pip3 install awscli==1.32.17
 
 # Install gh cli
 RUN curl -fsSL https://cli.github.com/packages/githubcli-archive-keyring.gpg | dd of=/usr/share/keyrings/githubcli-archive-keyring.gpg && \

diff --git a/docker/ci/dockerfiles/current/release.centos7.clients.x64.arm64.dockerfile b/docker/ci/dockerfiles/current/release.centos7.clients.x64.arm64.dockerfile
@@ -74,7 +74,7 @@ ENV JAVA_HOME=/opt/java/openjdk-11
 ENV PATH=$PATH:$JAVA_HOME/bin
 
 # Installing higher version of maven 3.8.x
-RUN export MAVEN_URL=`curl -s https://maven.apache.org/download.cgi | grep -Eo '["\047].*.bin.tar.gz["\047]' | tr -d '"'`  && \
+RUN export MAVEN_URL=`curl -s https://maven.apache.org/download.cgi | grep -Eo '["\047].*.bin.tar.gz["\047]' | tr -d '"' | uniq | head -n 1`  && \
     mkdir -p $MAVEN_DIR && (curl -s $MAVEN_URL | tar xzf - --strip-components=1 -C $MAVEN_DIR) && \
     echo "export M2_HOME=$MAVEN_DIR" > /etc/profile.d/maven_path.sh && \
     echo "export M2=\$M2_HOME/bin" >> /etc/profile.d/maven_path.sh && \
@@ -95,7 +95,7 @@ RUN ln -sfn /usr/local/bin/python3.9 /usr/bin/python3 && \
     ln -sfn /usr/local/bin/pip3.9 /usr/bin/pip && \
     ln -sfn /usr/local/bin/pip3.9 /usr/local/bin/pip && \
     ln -sfn /usr/local/bin/pip3.9 /usr/bin/pip3 && \
-    pip3 install pip==23.1.2 && pip3 install pipenv==2023.6.12 awscli==1.22.12
+    pip3 install pip==23.1.2 && pip3 install pipenv==2023.6.12 awscli==1.32.17
 
 # Installing pip packages
 RUN pip3 install twine==4.0.2 cmake==3.24.1.1

diff --git a/docker/ci/dockerfiles/current/test.rockylinux8.opensearch-dashboards.x64.arm64.dockerfile b/docker/ci/dockerfiles/current/test.rockylinux8.opensearch-dashboards.x64.arm64.dockerfile
@@ -126,7 +126,7 @@ RUN chmod -R 777 /dev/shm
 # Install Python binary
 RUN update-alternatives --set python /usr/bin/python3.9 && \
     update-alternatives --set python3 /usr/bin/python3.9 && \
-    pip3 install pip==23.1.2 && pip3 install pipenv==2023.6.12 awscli==1.22.12
+    pip3 install pip==23.1.2 && pip3 install pipenv==2023.6.12 awscli==1.32.17
 
 # Add other dependencies
 RUN yum install -y epel-release && yum clean all && yum install -y chromium jq && yum clean all && rm -rf /var/cache/yum/* && \

diff --git a/docker/ci/dockerfiles/current/test.rockylinux8.systemd-base.x64.arm64.dockerfile b/docker/ci/dockerfiles/current/test.rockylinux8.systemd-base.x64.arm64.dockerfile
@@ -147,7 +147,7 @@ RUN chmod -R 777 /dev/shm
 # Install Python binary
 RUN update-alternatives --set python /usr/bin/python3.9 && \
     update-alternatives --set python3 /usr/bin/python3.9 && \
-    pip3 install pip==23.1.2 && pip3 install pipenv==2023.6.12 awscli==1.22.12
+    pip3 install pip==23.1.2 && pip3 install pipenv==2023.6.12 awscli==1.32.17
 
 # Add other dependencies
 RUN dnf install -y epel-release && dnf clean all && dnf install -y chromium jq && dnf clean all && \

diff --git a/docker/ci/dockerfiles/current/test.ubuntu2004.systemd-base.x64.arm64.dockerfile b/docker/ci/dockerfiles/current/test.ubuntu2004.systemd-base.x64.arm64.dockerfile
@@ -114,7 +114,7 @@ RUN apt-get update -y && apt-get upgrade -y && apt-get install -y curl git gnupg
 
 # Install pip packages
 RUN curl -SL https://bootstrap.pypa.io/get-pip.py | python && \
-    pip3 install pip==23.1.2 && pip3 install pipenv==2023.6.12 awscli==1.22.12 && \
+    pip3 install pip==23.1.2 && pip3 install pipenv==2023.6.12 awscli==1.32.17 && \
     pip3 install cmake==3.23.3
 
 # Create user group