From 519bab62bfcf7fa8e4feba2b33a839bc9be30e6d Mon Sep 17 00:00:00 2001 From: George Adams Date: Mon, 15 Jul 2024 13:57:35 +0100 Subject: [PATCH 1/3] attempt to fix failing Alpine Linux tests --- .../src/packageTest/java/packaging/AlpineFlavours.java | 7 +++---- .../src/packageTest/java/packaging/AlpineFlavours.java | 7 +++---- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/linux/jdk/alpine/src/packageTest/java/packaging/AlpineFlavours.java b/linux/jdk/alpine/src/packageTest/java/packaging/AlpineFlavours.java index 1b6f067fb..a81f7de99 100644 --- a/linux/jdk/alpine/src/packageTest/java/packaging/AlpineFlavours.java +++ b/linux/jdk/alpine/src/packageTest/java/packaging/AlpineFlavours.java @@ -35,10 +35,9 @@ public Stream provideArguments(ExtensionContext context) { return Stream.of( Arguments.of("alpine", "edge"), Arguments.of("alpine", "latest"), - Arguments.of("alpine", "3.17"), - Arguments.of("alpine", "3.16"), - Arguments.of("alpine", "3.15"), - Arguments.of("alpine", "3.14") + Arguments.of("alpine", "3.19"), + Arguments.of("alpine", "3.18"), + Arguments.of("alpine", "3.17") ); } } diff --git a/linux/jre/alpine/src/packageTest/java/packaging/AlpineFlavours.java b/linux/jre/alpine/src/packageTest/java/packaging/AlpineFlavours.java index 7af7896db..e62890685 100644 --- a/linux/jre/alpine/src/packageTest/java/packaging/AlpineFlavours.java +++ b/linux/jre/alpine/src/packageTest/java/packaging/AlpineFlavours.java @@ -35,10 +35,9 @@ public Stream provideArguments(ExtensionContext context) { return Stream.of( Arguments.of("alpine", "edge"), Arguments.of("alpine", "latest"), - Arguments.of("alpine", "3.17"), - Arguments.of("alpine", "3.16"), - Arguments.of("alpine", "3.15"), - Arguments.of("alpine", "3.14") + Arguments.of("alpine", "3.19"), + Arguments.of("alpine", "3.18"), + Arguments.of("alpine", "3.17") ); } } From 2d1bd942638d7b6be312233e67fae5e495952332 Mon Sep 17 00:00:00 2001 From: George Adams Date: Mon, 15 Jul 2024 14:07:08 +0100 Subject: [PATCH 2/3] try this --- linux/jdk/alpine/src/main/packaging/Dockerfile | 1 + 1 file changed, 1 insertion(+) diff --git a/linux/jdk/alpine/src/main/packaging/Dockerfile b/linux/jdk/alpine/src/main/packaging/Dockerfile index f4dcffcc1..fa6180091 100644 --- a/linux/jdk/alpine/src/main/packaging/Dockerfile +++ b/linux/jdk/alpine/src/main/packaging/Dockerfile @@ -31,6 +31,7 @@ RUN --mount=type=secret,id=gpg,gid=1000,uid=1000,dst=/tmp/private.rsa \ wget -o /home/builder/.abuild/private.rsa.pub https://packages.adoptium.net/artifactory/api/security/keypair/public/repositories/apk; \ else \ abuild-keygen -a -n; \ + sudo cp /home/builder/.abuild/*.rsa.pub /etc/apk/keys/; \ fi # Prepare entrypoint From cac862b2709ffa3820471cb0b4d8aeba42f745b1 Mon Sep 17 00:00:00 2001 From: George Adams Date: Mon, 15 Jul 2024 14:09:42 +0100 Subject: [PATCH 3/3] fix JRE too --- linux/jre/alpine/src/main/packaging/Dockerfile | 1 + 1 file changed, 1 insertion(+) diff --git a/linux/jre/alpine/src/main/packaging/Dockerfile b/linux/jre/alpine/src/main/packaging/Dockerfile index 0b2869cdd..bba0bc778 100644 --- a/linux/jre/alpine/src/main/packaging/Dockerfile +++ b/linux/jre/alpine/src/main/packaging/Dockerfile @@ -27,6 +27,7 @@ RUN --mount=type=secret,id=gpg,gid=1000,uid=1000,dst=/tmp/private.rsa \ wget -o /home/builder/.abuild/private.rsa.pub https://packages.adoptium.net/artifactory/api/security/keypair/public/repositories/apk; \ else \ abuild-keygen -a -n; \ + sudo cp /home/builder/.abuild/*.rsa.pub /etc/apk/keys/; \ fi # Prepare entrypoint