From c3c3995b991a80c05ec082bc4eef62b115d04cf7 Mon Sep 17 00:00:00 2001 From: Gian Merlino Date: Thu, 18 Sep 2025 19:18:10 -0700 Subject: [PATCH 1/2] Use archive.apache.org for integration test dependencies. In #17585 the download url was changed from archive.apache.org to downloads.apache.org, due to the fact that downloads.apache.org is more recommended. However, currently, downloads.apache.org only has ZooKeeper 3.8.5, which was released today and not yet available on Docker Hub (which we also need). Therefore, to get our tests running again, we need to revert back to archive.apache.org. --- examples/quickstart/tutorial/hadoop/docker/Dockerfile | 3 ++- integration-tests/README.md | 2 +- integration-tests/docker/Dockerfile | 3 ++- integration-tests/docker/base-setup.sh | 4 +++- 4 files changed, 8 insertions(+), 4 deletions(-) diff --git a/examples/quickstart/tutorial/hadoop/docker/Dockerfile b/examples/quickstart/tutorial/hadoop/docker/Dockerfile index 157ccf8e98e8..53626d2fd2ff 100644 --- a/examples/quickstart/tutorial/hadoop/docker/Dockerfile +++ b/examples/quickstart/tutorial/hadoop/docker/Dockerfile @@ -61,7 +61,8 @@ ENV JAVA_HOME=/usr/lib/jvm/zulu11 ENV PATH=$PATH:$JAVA_HOME/bin # hadoop -ARG APACHE_ARCHIVE_MIRROR_HOST=https://downloads.apache.org +# Using archive.apache.org instead of downloads.apache.org to avoid build failures, see https://github.com/apache/druid/pull/18548 +ARG APACHE_ARCHIVE_MIRROR_HOST=https://archive.apache.org RUN curl -s ${APACHE_ARCHIVE_MIRROR_HOST}/hadoop/core/hadoop-3.3.6/hadoop-3.3.6.tar.gz | tar -xz -C /usr/local/ RUN cd /usr/local && ln -s ./hadoop-3.3.6 hadoop diff --git a/integration-tests/README.md b/integration-tests/README.md index a00b6e31bc0a..8030440678e8 100644 --- a/integration-tests/README.md +++ b/integration-tests/README.md @@ -46,7 +46,7 @@ environment variable to localhost on your system, as follows: export DOCKER_IP=127.0.0.1 ``` -Optionally, you can also set `APACHE_ARCHIVE_MIRROR_HOST` to override `https://downloads.apache.org` host. This host is used to download archives such as hadoop and kafka during building docker images: +Optionally, you can also set `APACHE_ARCHIVE_MIRROR_HOST` to override the default host. This host is used to download archives such as hadoop and kafka during building docker images: ```bash export APACHE_ARCHIVE_MIRROR_HOST=https://example.com/remote-generic-repo diff --git a/integration-tests/docker/Dockerfile b/integration-tests/docker/Dockerfile index 896c6e9af97d..865ed1a02c74 100644 --- a/integration-tests/docker/Dockerfile +++ b/integration-tests/docker/Dockerfile @@ -23,8 +23,9 @@ COPY base-setup.sh /root/base-setup.sh ARG KAFKA_VERSION # ZooKeeper version to install in the base image # This is passed in by maven at build time to align with the client version we depend on in the pom file +# Using archive.apache.org instead of downloads.apache.org to avoid build failures, see https://github.com/apache/druid/pull/18548 ARG ZK_VERSION -ARG APACHE_ARCHIVE_MIRROR_HOST=https://downloads.apache.org +ARG APACHE_ARCHIVE_MIRROR_HOST=https://archive.apache.org RUN APACHE_ARCHIVE_MIRROR_HOST=${APACHE_ARCHIVE_MIRROR_HOST} /root/base-setup.sh && rm -f /root/base-setup.sh FROM druidbase diff --git a/integration-tests/docker/base-setup.sh b/integration-tests/docker/base-setup.sh index 65f8a2b56d2f..41bd1029e2de 100755 --- a/integration-tests/docker/base-setup.sh +++ b/integration-tests/docker/base-setup.sh @@ -18,7 +18,9 @@ set -e set -u export DEBIAN_FRONTEND=noninteractive -APACHE_ARCHIVE_MIRROR_HOST=${APACHE_ARCHIVE_MIRROR_HOST:-https://downloads.apache.org} + +# Using archive.apache.org instead of downloads.apache.org to avoid build failures, see https://github.com/apache/druid/pull/18548 +APACHE_ARCHIVE_MIRROR_HOST=${APACHE_ARCHIVE_MIRROR_HOST:-https://archive.apache.org} apt-get update From b6df93bffebdc604e9c968d6c9c7f5a974447870 Mon Sep 17 00:00:00 2001 From: Gian Merlino Date: Thu, 18 Sep 2025 21:18:38 -0700 Subject: [PATCH 2/2] Need /dist in the url. --- examples/quickstart/tutorial/hadoop/docker/Dockerfile | 2 +- integration-tests/docker/Dockerfile | 2 +- integration-tests/docker/base-setup.sh | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/examples/quickstart/tutorial/hadoop/docker/Dockerfile b/examples/quickstart/tutorial/hadoop/docker/Dockerfile index 53626d2fd2ff..d1e420765735 100644 --- a/examples/quickstart/tutorial/hadoop/docker/Dockerfile +++ b/examples/quickstart/tutorial/hadoop/docker/Dockerfile @@ -62,7 +62,7 @@ ENV PATH=$PATH:$JAVA_HOME/bin # hadoop # Using archive.apache.org instead of downloads.apache.org to avoid build failures, see https://github.com/apache/druid/pull/18548 -ARG APACHE_ARCHIVE_MIRROR_HOST=https://archive.apache.org +ARG APACHE_ARCHIVE_MIRROR_HOST=https://archive.apache.org/dist RUN curl -s ${APACHE_ARCHIVE_MIRROR_HOST}/hadoop/core/hadoop-3.3.6/hadoop-3.3.6.tar.gz | tar -xz -C /usr/local/ RUN cd /usr/local && ln -s ./hadoop-3.3.6 hadoop diff --git a/integration-tests/docker/Dockerfile b/integration-tests/docker/Dockerfile index 865ed1a02c74..c1e7095a421a 100644 --- a/integration-tests/docker/Dockerfile +++ b/integration-tests/docker/Dockerfile @@ -25,7 +25,7 @@ ARG KAFKA_VERSION # This is passed in by maven at build time to align with the client version we depend on in the pom file # Using archive.apache.org instead of downloads.apache.org to avoid build failures, see https://github.com/apache/druid/pull/18548 ARG ZK_VERSION -ARG APACHE_ARCHIVE_MIRROR_HOST=https://archive.apache.org +ARG APACHE_ARCHIVE_MIRROR_HOST=https://archive.apache.org/dist RUN APACHE_ARCHIVE_MIRROR_HOST=${APACHE_ARCHIVE_MIRROR_HOST} /root/base-setup.sh && rm -f /root/base-setup.sh FROM druidbase diff --git a/integration-tests/docker/base-setup.sh b/integration-tests/docker/base-setup.sh index 41bd1029e2de..b3910c71c232 100755 --- a/integration-tests/docker/base-setup.sh +++ b/integration-tests/docker/base-setup.sh @@ -20,7 +20,7 @@ set -u export DEBIAN_FRONTEND=noninteractive # Using archive.apache.org instead of downloads.apache.org to avoid build failures, see https://github.com/apache/druid/pull/18548 -APACHE_ARCHIVE_MIRROR_HOST=${APACHE_ARCHIVE_MIRROR_HOST:-https://archive.apache.org} +APACHE_ARCHIVE_MIRROR_HOST=${APACHE_ARCHIVE_MIRROR_HOST:-https://archive.apache.org/dist} apt-get update