From 05885f1c0f886bbbdb4955e3b6ec0a2cb2fb2353 Mon Sep 17 00:00:00 2001 From: Scott Fryer <60462088+steelhead31@users.noreply.github.com> Date: Thu, 23 May 2024 06:09:37 +0100 Subject: [PATCH] Add missing distributions for the JRE packages (#913) * Add missing deb distro. * Add new debian distros for jre --- linux/jre/debian/src/main/packaging/build.sh | 2 +- .../java/packaging/DebianFlavours.java | 18 ++++++++++-------- 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/linux/jre/debian/src/main/packaging/build.sh b/linux/jre/debian/src/main/packaging/build.sh index a5c75aaa9..99bb687aa 100644 --- a/linux/jre/debian/src/main/packaging/build.sh +++ b/linux/jre/debian/src/main/packaging/build.sh @@ -27,7 +27,7 @@ if [ "$buildLocalFlag" == "true" ]; then fi # $ and $ARCH are env variables passing in from "docker run" -debVersionList="bookworm bullseye buster jammy focal bionic" +debVersionList="trixie bookworm bullseye buster noble jammy focal bionic" # the target package is only based on the host machine's ARCH # ${buildArch} is only used for debug purpose what really matter is the label on the jenkins agent diff --git a/linux/jre/debian/src/packageTest/java/packaging/DebianFlavours.java b/linux/jre/debian/src/packageTest/java/packaging/DebianFlavours.java index 135351ab1..d16e0a873 100644 --- a/linux/jre/debian/src/packageTest/java/packaging/DebianFlavours.java +++ b/linux/jre/debian/src/packageTest/java/packaging/DebianFlavours.java @@ -35,13 +35,15 @@ public Stream provideArguments(ExtensionContext context) { * Ubuntu policy: Current LTS versions, and development version. * (https://wiki.ubuntu.com/Releases) */ - return Stream.of( - Arguments.of("debian", "bookworm"), // Debian/12 (testing) - Arguments.of("debian", "bullseye"), // Debian/11 (stable) - Arguments.of("debian", "buster"), // Debian/10 (oldstable) - Arguments.of("ubuntu", "jammy"), // Ubuntu/22.04 (LTS) - Arguments.of("ubuntu", "focal"), // Ubuntu/20.04 (LTS) - Arguments.of("ubuntu", "bionic") // Ubuntu/18.04 (LTS) - ); + return Stream.of( + Arguments.of("debian", "trixie"), // Debian/13 (testing) + Arguments.of("debian", "bookworm"), // Debian/12 (testing) + Arguments.of("debian", "bullseye"), // Debian/11 (stable) + Arguments.of("debian", "buster"), // Debian/10 (oldstable) + Arguments.of("ubuntu", "noble"), // Ubuntu/24.04 (LTS) + Arguments.of("ubuntu", "jammy"), // Ubuntu/22.04 (LTS) + Arguments.of("ubuntu", "focal"), // Ubuntu/20.04 (LTS) + Arguments.of("ubuntu", "bionic") // Ubuntu/18.04 (LTS) + ); } }