From 0698816c8342823939c001b06bb77bf880479367 Mon Sep 17 00:00:00 2001 From: Rishabh Patel Date: Thu, 12 Dec 2024 15:35:28 -0800 Subject: [PATCH 1/2] HDDS-5045. Add rclone package for robot test --- Dockerfile | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/Dockerfile b/Dockerfile index 49d565b..df7e943 100644 --- a/Dockerfile +++ b/Dockerfile @@ -58,6 +58,11 @@ RUN sudo python3 -m pip install --upgrade pip COPY --from=go /go/bin/csc /usr/bin/csc +RUN dnf install -y unzip \ + && curl https://rclone.org/install.sh | sudo bash \ + && dnf remove -y unzip \ + && dnf clean all + #For executing inline smoketest RUN set -eux ; \ pip3 install awscli robotframework==6.1.1 boto3 ; \ From 4ca791d201b588785e8f71616a243e51348dd2f8 Mon Sep 17 00:00:00 2001 From: Rishabh Patel Date: Fri, 13 Dec 2024 10:53:52 -0800 Subject: [PATCH 2/2] HDDS-5045. Use rpm packages to install rclone --- Dockerfile | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/Dockerfile b/Dockerfile index df7e943..d2c8964 100644 --- a/Dockerfile +++ b/Dockerfile @@ -58,10 +58,18 @@ RUN sudo python3 -m pip install --upgrade pip COPY --from=go /go/bin/csc /usr/bin/csc -RUN dnf install -y unzip \ - && curl https://rclone.org/install.sh | sudo bash \ - && dnf remove -y unzip \ - && dnf clean all +# Install rclone for smoketest +RUN set -eux ; \ + ARCH="$(arch)" ; \ + case "${ARCH}" in \ + x86_64) url='https://downloads.rclone.org/rclone-current-linux-amd64.rpm' ;; \ + aarch64) url='https://downloads.rclone.org/rclone-current-linux-arm64.rpm' ;; \ + *) echo "Unsupported architecture: ${ARCH}"; exit 1 ;; \ + esac; \ + curl -L -o /tmp/package.rpm "${url}"; \ + dnf install -y /tmp/package.rpm; \ + rm -f /tmp/package.rpm + #For executing inline smoketest RUN set -eux ; \