From 8fd3f60dbbae3c011a52722d647611dfe0da1c75 Mon Sep 17 00:00:00 2001 From: Andrew Hsu Date: Tue, 26 Nov 2024 19:25:14 -0600 Subject: [PATCH 1/6] tests/docker: fix captialization warn on docker build > WARN: FromAsCasing: 'as' and 'FROM' keywords' casing do not match --- tests/docker/Dockerfile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tests/docker/Dockerfile b/tests/docker/Dockerfile index 2b39f2da0e29a..c81207110ab11 100644 --- a/tests/docker/Dockerfile +++ b/tests/docker/Dockerfile @@ -241,20 +241,20 @@ COPY --chown=0:0 --chmod=0755 tests/docker/ducktape-deps/polaris / RUN /polaris && rm /polaris ################################# -FROM base as iceberg-rest +FROM base AS iceberg-rest COPY --chown=0:0 tests/java/iceberg-rest-catalog /opt/redpanda-tests/java/iceberg-rest-catalog COPY --chown=0:0 --chmod=0755 tests/docker/ducktape-deps/iceberg-rest-catalog / RUN /iceberg-rest-catalog && rm /iceberg-rest-catalog ################################# -FROM base as trino +FROM base AS trino COPY --chown=0:0 --chmod=0755 tests/docker/ducktape-deps/trino / RUN /trino && rm /trino ################################# -FROM base as spark +FROM base AS spark COPY --chown=0:0 tests/java/spark-iceberg-dependencies /opt/redpanda-tests/java/spark-iceberg-dependencies COPY --chown=0:0 --chmod=0755 tests/docker/ducktape-deps/spark / RUN /spark && rm /spark From 9aba27dbed367bc6100c1b92b489361de37c1e2a Mon Sep 17 00:00:00 2001 From: Andrew Hsu Date: Tue, 26 Nov 2024 19:22:44 -0600 Subject: [PATCH 2/6] tests/docker: update base image to latest ubuntu jammy --- tests/docker/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/docker/Dockerfile b/tests/docker/Dockerfile index c81207110ab11..0337cdee70827 100644 --- a/tests/docker/Dockerfile +++ b/tests/docker/Dockerfile @@ -12,7 +12,7 @@ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. -FROM public.ecr.aws/docker/library/ubuntu:jammy-20230816 AS base +FROM public.ecr.aws/docker/library/ubuntu:jammy-20240911.1 AS base ENV TZ="UTC" \ DEBIAN_FRONTEND=noninteractive From fe1084f1f103a5c2cdfe25cba64cc033ed4e62f3 Mon Sep 17 00:00:00 2001 From: Andrew Hsu Date: Tue, 26 Nov 2024 18:54:47 -0600 Subject: [PATCH 3/6] tests/docker: verbose client-swarm Enabling cargo verbose will print helpful info to diagnose network issues. Verbose output has info related to download speed. --- tests/docker/ducktape-deps/client-swarm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/docker/ducktape-deps/client-swarm b/tests/docker/ducktape-deps/client-swarm index 71f7e5f7f138c..1b30ada884f0c 100644 --- a/tests/docker/ducktape-deps/client-swarm +++ b/tests/docker/ducktape-deps/client-swarm @@ -7,7 +7,7 @@ git clone https://github.com/redpanda-data/client-swarm.git pushd client-swarm git reset --hard 7ba96b8a78717c03392a3959a31e3c5a36cda472 -cargo build --release +cargo build --config 'term.verbose=true' --release cp target/release/client-swarm /usr/local/bin popd From 6109e98a9456600d27862467e4b4d60cd65f318d Mon Sep 17 00:00:00 2001 From: Andrew Hsu Date: Tue, 26 Nov 2024 18:56:09 -0600 Subject: [PATCH 4/6] tests/docker: verbose rp-storage-tool Enabling cargo verbose will print helpful info to diagnose network issues. Verbose output has info related to download speed. --- tests/docker/ducktape-deps/rp-storage-tool | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/docker/ducktape-deps/rp-storage-tool b/tests/docker/ducktape-deps/rp-storage-tool index e4577c4b85c09..acedaa728f637 100644 --- a/tests/docker/ducktape-deps/rp-storage-tool +++ b/tests/docker/ducktape-deps/rp-storage-tool @@ -3,6 +3,6 @@ set -e set -x cd /rp_storage_tool -cargo build --release +cargo build --config 'term.verbose=true' --release cp target/release/rp-storage-tool /usr/local/bin cd / From 0c753c97bf1a032859227c6eaad7c35357177717 Mon Sep 17 00:00:00 2001 From: Andrew Hsu Date: Tue, 26 Nov 2024 20:02:53 -0600 Subject: [PATCH 5/6] tests/docker: increase cargo retry from 3 to 6 in rp-storage-tool --- tests/docker/ducktape-deps/rp-storage-tool | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/docker/ducktape-deps/rp-storage-tool b/tests/docker/ducktape-deps/rp-storage-tool index acedaa728f637..a676b8f8c13fb 100644 --- a/tests/docker/ducktape-deps/rp-storage-tool +++ b/tests/docker/ducktape-deps/rp-storage-tool @@ -3,6 +3,6 @@ set -e set -x cd /rp_storage_tool -cargo build --config 'term.verbose=true' --release +cargo build --config 'term.verbose=true' --config 'net.retry=6' --release cp target/release/rp-storage-tool /usr/local/bin cd / From bf892a9c210e4d7bd3bab4f4fec69219b733ae48 Mon Sep 17 00:00:00 2001 From: Andrew Hsu Date: Tue, 26 Nov 2024 20:03:47 -0600 Subject: [PATCH 6/6] tests/docker: increase cargo retry from 3 to 6 in client-swarm --- tests/docker/ducktape-deps/client-swarm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/docker/ducktape-deps/client-swarm b/tests/docker/ducktape-deps/client-swarm index 1b30ada884f0c..3f74dbba5e949 100644 --- a/tests/docker/ducktape-deps/client-swarm +++ b/tests/docker/ducktape-deps/client-swarm @@ -7,7 +7,7 @@ git clone https://github.com/redpanda-data/client-swarm.git pushd client-swarm git reset --hard 7ba96b8a78717c03392a3959a31e3c5a36cda472 -cargo build --config 'term.verbose=true' --release +cargo build --config 'term.verbose=true' --config 'net.retry=6' --release cp target/release/client-swarm /usr/local/bin popd