Carrying over jdk21 changes to jdk22 and up

Signed-off-by: Adam Farley <[email protected]>
adoptium · Mar 12, 2024 · e8e8a5e · e8e8a5e
1 parent 88e2e43
commit e8e8a5e
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/linux/Jenkinsfile b/linux/Jenkinsfile
@@ -37,7 +37,7 @@ pipeline {
     }
     parameters {
         choice(name: 'TYPE', choices: Types.ALL, description: 'Build JDK or JRE')
-        choice(name: 'VERSION', choices: ['8', '11', '17', '21'], description: 'Build for specific JDK VERSION')
+        choice(name: 'VERSION', choices: ['8', '11', '17', '21', '22'], description: 'Build for specific JDK VERSION')
         choice(name: 'ARCH', choices: ['x86_64', 'armv7hl', 'armv7l', 'aarch64', 'ppc64le', 's390x', 'all'], description: 'Build for specific platform\n s390x not for VERSION 8\n Use armv7l for DebARM32 armv7hl for RH/Suse')
         choice(name: 'DISTRO', choices: ['all', 'Alpine', 'Debian', 'RedHat', 'Suse'], description: 'Build for specific Distro\n Select RPM builds for RedHat and Suse')
         booleanParam(name: 'uploadPackage', defaultValue: false, description: 'Tick this box to upload the deb/rpm files (exclude src.rpm) to Artifactory for official release')
@@ -253,7 +253,7 @@ def jenkinsStepAlpine() {
         apkArchAllList = ['x86_64', 'aarch64']
     }
     // remove aarch64 for JDK20 and below
-    if ("${VERSION}" != '21') {
+    if (${VERSION} -lt 21) {
         apkArchAllList.remove('aarch64')
     }
 

diff --git a/linux/jre/redhat/src/main/packaging/build.sh b/linux/jre/redhat/src/main/packaging/build.sh
@@ -31,7 +31,7 @@ echo "DEBUG: building RH arch ${buildArch} with jre version ${buildVersion}"
 # Build specified target or build all
 if [ "${buildArch}" != "all" ]; then
 	targets=${buildArch}
-elif [ "${buildVersion}" = "21" ]; then
+elif [ ${buildVersion} -gt 20 ]; then
         targets="x86_64 ppc64le aarch64"
 else
 	targets="x86_64 ppc64le aarch64 armv7hl s390x"

diff --git a/linux/jre/suse/src/main/packaging/build.sh b/linux/jre/suse/src/main/packaging/build.sh
@@ -8,7 +8,7 @@ echo "DEBUG: building Suse arch ${buildArch} with version ${buildVersion}"
 # Build specified target or build all (not s390x on jre8)
 if [ "${buildArch}" != "all" ]; then
 	targets=${buildArch}
-elif [ "${buildVersion}" = "21" ]; then
+elif [ ${buildVersion} -gt 20 ]; then
         targets="x86_64 ppc64le aarch64"
 else
 	targets="x86_64 ppc64le aarch64 armv7hl s390x"