diff --git a/.github/workflows/cacert-publish.yml b/.github/workflows/cacert-publish.yml index 9b7cc825e..c91e1e57c 100644 --- a/.github/workflows/cacert-publish.yml +++ b/.github/workflows/cacert-publish.yml @@ -54,7 +54,7 @@ jobs: - name: Upload deb file to Artifactory if: steps.check-deb.outputs.file_exists == 'false' run: | - debVersionList=("bookworm" "bullseye" "buster" "kinetic" "jammy" "focal" "bionic") + debVersionList=("bookworm" "bullseye" "buster" "jammy" "focal" "bionic") for debVersion in "${debVersionList[@]}"; do distroList+="deb.distribution=${debVersion};" done diff --git a/linux/Jenkinsfile b/linux/Jenkinsfile index 60eb70cfc..26d054842 100644 --- a/linux/Jenkinsfile +++ b/linux/Jenkinsfile @@ -317,7 +317,6 @@ def uploadDebArtifacts(String buildArch) { "bookworm", // Debian/12 "bullseye", // Debian/11 "buster", // Debian/10 - "kinetic", // Ubuntu/22.10 "jammy", // Ubuntu/22.04 (LTS) "focal", // Ubuntu/20.04 (LTS) "bionic", // Ubuntu/18.04 (LTS) diff --git a/linux/README.md b/linux/README.md index 9dd8173ce..d753224c2 100644 --- a/linux/README.md +++ b/linux/README.md @@ -202,7 +202,6 @@ Supported platform amd64, arm64, armhf, ppc64le, s390x (s390x is only available | debian/12 (bookworm/testing) | x86_64 | | | debian/11 (bullseye/stable) | x86_64 | | | debian/10 (buster/oldstable) | x86_64 | | -| ubuntu/22.10 (kinetic) | x86_64 | | | ubuntu/22.04 (jammy) | x86_64 | | | ubuntu/20.04 (focal) | x86_64 | | | ubuntu/18.04 (bionic) | x86_64 | | diff --git a/linux/ca-certificates/debian/build.gradle b/linux/ca-certificates/debian/build.gradle index 2b378c865..c2f6d22aa 100644 --- a/linux/ca-certificates/debian/build.gradle +++ b/linux/ca-certificates/debian/build.gradle @@ -28,7 +28,6 @@ def deb_versions = [ "bookworm", // Debian/12 "bullseye", // Debian/11 "buster", // Debian/10 - "kinetic", // Ubuntu/22.10 "jammy", // Ubuntu/22.04 (LTS) "focal", // Ubuntu/20.04 (LTS) "bionic", // Ubuntu/18.04 (LTS) diff --git a/linux/ca-certificates/debian/src/packageTest/java/org/adoptium/cacertificates/ChangesVerificationTest.java b/linux/ca-certificates/debian/src/packageTest/java/org/adoptium/cacertificates/ChangesVerificationTest.java index 7df49ae78..12c47ada3 100644 --- a/linux/ca-certificates/debian/src/packageTest/java/org/adoptium/cacertificates/ChangesVerificationTest.java +++ b/linux/ca-certificates/debian/src/packageTest/java/org/adoptium/cacertificates/ChangesVerificationTest.java @@ -35,7 +35,6 @@ class ChangesVerificationTest { "bookworm", // Debian/12 "bullseye", // Debian/11 "buster", // Debian/10 - "kinetic", // Ubuntu/22.10 "jammy", // Ubuntu/22.04 (LTS) "focal", // Ubuntu/20.04 (LTS) "bionic", // Ubuntu/18.04 (LTS) diff --git a/linux/ca-certificates/debian/src/packageTest/java/org/adoptium/cacertificates/DebianFlavours.java b/linux/ca-certificates/debian/src/packageTest/java/org/adoptium/cacertificates/DebianFlavours.java index 4682796c7..29c0f9cc1 100644 --- a/linux/ca-certificates/debian/src/packageTest/java/org/adoptium/cacertificates/DebianFlavours.java +++ b/linux/ca-certificates/debian/src/packageTest/java/org/adoptium/cacertificates/DebianFlavours.java @@ -38,7 +38,6 @@ public Stream provideArguments(ExtensionContext context) { Arguments.of("debian", "bookworm"), // Debian/12 (testing) Arguments.of("debian", "bullseye"), // Debian/11 (stable) Arguments.of("debian", "buster"), // Debian/10 (oldstable) - Arguments.of("ubuntu", "kinetic"), // Ubuntu/22.10 Arguments.of("ubuntu", "jammy"), // Ubuntu/22.04 (LTS) Arguments.of("ubuntu", "focal"), // Ubuntu/20.04 (LTS) Arguments.of("ubuntu", "bionic") // Ubuntu/18.04 (LTS) diff --git a/linux/jdk/debian/src/main/packaging/build.sh b/linux/jdk/debian/src/main/packaging/build.sh index ad10260b1..18eaf6d70 100644 --- a/linux/jdk/debian/src/main/packaging/build.sh +++ b/linux/jdk/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 kinetic jammy focal bionic" +debVersionList="bookworm bullseye buster 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/jdk/debian/src/packageTest/java/packaging/DebianFlavours.java b/linux/jdk/debian/src/packageTest/java/packaging/DebianFlavours.java index 379048eba..c96118e66 100644 --- a/linux/jdk/debian/src/packageTest/java/packaging/DebianFlavours.java +++ b/linux/jdk/debian/src/packageTest/java/packaging/DebianFlavours.java @@ -39,7 +39,6 @@ public Stream provideArguments(ExtensionContext context) { Arguments.of("debian", "bookworm"), // Debian/12 (testing) Arguments.of("debian", "bullseye"), // Debian/11 (stable) Arguments.of("debian", "buster"), // Debian/10 (oldstable) - Arguments.of("ubuntu", "kinetic"), // Ubuntu/22.10 Arguments.of("ubuntu", "jammy"), // Ubuntu/22.04 (LTS) Arguments.of("ubuntu", "focal"), // Ubuntu/20.04 (LTS) Arguments.of("ubuntu", "bionic") // Ubuntu/18.04 (LTS) diff --git a/linux/jre/debian/src/main/packaging/build.sh b/linux/jre/debian/src/main/packaging/build.sh index bdf830aba..a5c75aaa9 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 kinetic jammy focal bionic" +debVersionList="bookworm bullseye buster 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 054ef83a5..135351ab1 100644 --- a/linux/jre/debian/src/packageTest/java/packaging/DebianFlavours.java +++ b/linux/jre/debian/src/packageTest/java/packaging/DebianFlavours.java @@ -39,7 +39,6 @@ public Stream provideArguments(ExtensionContext context) { Arguments.of("debian", "bookworm"), // Debian/12 (testing) Arguments.of("debian", "bullseye"), // Debian/11 (stable) Arguments.of("debian", "buster"), // Debian/10 (oldstable) - Arguments.of("ubuntu", "kinetic"), // Ubuntu/22.10 Arguments.of("ubuntu", "jammy"), // Ubuntu/22.04 (LTS) Arguments.of("ubuntu", "focal"), // Ubuntu/20.04 (LTS) Arguments.of("ubuntu", "bionic") // Ubuntu/18.04 (LTS)