Merge pull request #18603 from pshipton/jdk22

Add support for building jdk22
eclipse-openj9 · Dec 12, 2023 · 6b6d118 · 6b6d118
2 parents 0c87adb + 35fcba3
commit 6b6d118
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 1 deletion.
diff --git a/buildenv/jenkins/jobs/pipelines/Pipeline-Build-Test-All.groovy b/buildenv/jenkins/jobs/pipelines/Pipeline-Build-Test-All.groovy
@@ -66,7 +66,7 @@
  *   ENABLE_SUMMARY_AUTO_REFRESH: Boolean - flag to enable the downstream summary auto-refresh, default: false
  */
 
-CURRENT_RELEASES = ['8', '11', '17', '21', 'next']
+CURRENT_RELEASES = ['8', '11', '17', '21', '22', 'next']
 
 SPECS = ['ppc64_aix' : CURRENT_RELEASES,
          'ppc64le_linux'  : CURRENT_RELEASES,

diff --git a/buildenv/jenkins/variables/defaults.yml b/buildenv/jenkins/variables/defaults.yml
@@ -40,6 +40,10 @@ openjdk:
     default:
       repoUrl: 'https://github.com/ibmruntimes/openj9-openjdk-jdk21.git'
       branch: 'openj9'
+  22:
+    default:
+      repoUrl: 'https://github.com/ibmruntimes/openj9-openjdk-jdk22.git'
+      branch: 'openj9'
   next:
     default:
       repoUrl: 'https://github.com/ibmruntimes/openj9-openjdk-jdk.git'
@@ -110,6 +114,7 @@ build_discarder:
     OpenJDK11: 5
     OpenJDK17: 10
     OpenJDK21: 10
+    OpenJDK22: 10
     OpenJDK: 10
     Personal: 30
     Pipeline: 100
@@ -156,6 +161,7 @@ boot_jdk_default:
       11: '11'
       17: '17'
       21: '20'
+      22: '20'
       next: '20'
     dir_strip:
       all: '1'
@@ -259,13 +265,15 @@ ppc64_aix:
     11: '--disable-warnings-as-errors'
     17: '--disable-warnings-as-errors'
     21: '--disable-warnings-as-errors'
+    22: '--disable-warnings-as-errors'
     next: '--disable-warnings-as-errors'
   build_env:
     vars:
       8: 'PATH+XLC=/opt/IBM/xlC/13.1.3/bin:/opt/IBM/xlc/13.1.3/bin'
       11: 'PATH+XLC=/opt/IBM/xlC/16.1.0/bin:/opt/IBM/xlc/16.1.0/bin CC=xlclang CXX=xlclang++'
       17: 'PATH+XLC=/opt/IBM/xlC/16.1.0/bin:/opt/IBM/xlc/16.1.0/bin CC=xlclang CXX=xlclang++'
       21: 'PATH+XLC=/opt/IBM/xlC/16.1.0/bin:/opt/IBM/xlc/16.1.0/bin CC=xlclang CXX=xlclang++'
+      22: 'PATH+XLC=/opt/IBM/xlC/16.1.0/bin:/opt/IBM/xlc/16.1.0/bin CC=xlclang CXX=xlclang++'
       next: 'PATH+XLC=/opt/IBM/xlC/16.1.0/bin:/opt/IBM/xlc/16.1.0/bin CC=xlclang CXX=xlclang++'
 #========================================#
 # Linux x86 64bits
@@ -301,6 +309,7 @@ x86-64_linux:
     11: '!sw.os.cent.6'
     17: '!sw.os.cent.6'
     21: '!sw.os.cent.6'
+    22: '!sw.os.cent.6'
     next: '!sw.os.cent.6'
 #========================================#
 # Linux x86 64bits /w JITSERVER