diff --git a/.github/workflows/docker-bats.yml b/.github/workflows/docker-bats.yml index 80effaad7..ca50d9a53 100644 --- a/.github/workflows/docker-bats.yml +++ b/.github/workflows/docker-bats.yml @@ -17,7 +17,6 @@ jobs: docker build \ --build-arg="GO_LIBRARY=go1.23.1.linux-amd64.tar.gz" \ --build-arg="AWS_CLI=awscli-exe-linux-x86_64.zip" \ - --build-arg="MC_FOLDER=linux-amd64" \ --progress=plain \ -f tests/Dockerfile_test_bats \ -t bats_test . diff --git a/tests/Dockerfile_direct b/tests/Dockerfile_direct index 5e4ecc143..e3acef0da 100644 --- a/tests/Dockerfile_direct +++ b/tests/Dockerfile_direct @@ -4,7 +4,6 @@ ARG DEBIAN_FRONTEND=noninteractive ARG SECRETS_FILE=tests/.secrets.direct ARG CONFIG_FILE=tests/.env.direct ARG AWS_CLI=awscli-exe-linux-aarch64.zip -ARG MC_FOLDER=linux-arm64 ENV TZ=Etc/UTC RUN apt-get update && \ @@ -28,12 +27,8 @@ WORKDIR /tmp # Install AWS cli RUN curl "https://awscli.amazonaws.com/${AWS_CLI}" -o "awscliv2.zip" && unzip awscliv2.zip && ./aws/install -# Install mc -RUN curl https://dl.min.io/client/mc/release/${MC_FOLDER}/mc \ - --create-dirs \ - -o /usr/local/minio-binaries/mc && \ -chmod -R 755 /usr/local/minio-binaries -ENV PATH=/usr/local/minio-binaries:${PATH} +# mc is not installed: dl.min.io no longer serves the MinIO client binaries +# (HTTP 410), so the mc test suites are not run. # Create tester user RUN groupadd -r tester && useradd -r -g tester tester diff --git a/tests/Dockerfile_test_bats b/tests/Dockerfile_test_bats index f8d020518..2e2a48300 100644 --- a/tests/Dockerfile_test_bats +++ b/tests/Dockerfile_test_bats @@ -5,7 +5,6 @@ ARG DEBIAN_FRONTEND=noninteractive ARG SECRETS_FILE=tests/.secrets ARG CONFIG_FILE=tests/.env.docker ARG GO_LIBRARY=go1.21.13.linux-${TARGETARCH}.tar.gz -ARG MC_FOLDER=linux-${TARGETARCH} ENV TZ=Etc/UTC WORKDIR /tmp @@ -24,12 +23,8 @@ RUN case "$TARGETARCH" in \ # Install AWS cli RUN . ./arch.env && curl "https://awscli.amazonaws.com/awscli-exe-linux-${DOWNLOAD_ARCH}.zip" -o "awscliv2.zip" && unzip awscliv2.zip && ./aws/install -# Install mc -RUN curl -fL https://dl.min.io/client/mc/release/${MC_FOLDER}/mc \ - --create-dirs \ - -o /usr/local/minio-binaries/mc && \ -chmod -R 755 /usr/local/minio-binaries -ENV PATH=/usr/local/minio-binaries:${PATH} +# mc is not installed: dl.min.io no longer serves the MinIO client binaries +# (HTTP 410), so the mc test suites are not run. # Download Go 1.21 (adjust the version and platform as needed) RUN wget https://golang.org/dl/${GO_LIBRARY} @@ -92,4 +87,4 @@ ENV WORKSPACE=. ENV VERSITYGW_TEST_ENV=/home/tester/config/.env ENTRYPOINT ["tests/run.sh"] -CMD ["s3api,s3,s3cmd,mc,rest"] +CMD ["s3api,s3,s3cmd,rest"]