JDK 22 EA

graalvm · Sep 26, 2023 · 22c773c · 22c773c
1 parent a0cf8d6
commit 22c773c
Show file tree

Hide file tree

Showing 10 changed files with 24 additions and 23 deletions.
diff --git a/jenkins/jobs/builds/mandrel_23_1_windows_build_matrix.groovy b/jenkins/jobs/builds/mandrel_23_1_windows_build_matrix.groovy
@@ -20,9 +20,9 @@ matrixJob('mandrel-23-1-windows-build-matrix') {
     logRotator {
         numToKeep(10)
     }
-    combinationFilter(
-            '!(JDK_VERSION=="21" && JDK_RELEASE=="ga")'
-    )
+//    combinationFilter(
+//            '!(JDK_VERSION=="21" && JDK_RELEASE=="ga")'
+//    )
     parameters {
         choiceParam('REPOSITORY', Constants.REPOSITORY, 'Mandrel repo')
         choiceParam(

diff --git a/jenkins/jobs/builds/mandrel_master_linux_build_matrix.groovy b/jenkins/jobs/builds/mandrel_master_linux_build_matrix.groovy
@@ -5,8 +5,8 @@ matrixJob('mandrel-master-linux-build-matrix') {
         labelExpression('LABEL', ['el8_aarch64', 'el8'])
         text('JDK_VERSION',
                 '17',
-                '20',
-                '21'
+                '21',
+                '22'
         )
         text('JDK_RELEASE',
                 'ea',
@@ -19,7 +19,7 @@ matrixJob('mandrel-master-linux-build-matrix') {
         numToKeep(5)
     }
     combinationFilter(
-            '!(JDK_VERSION=="21" && JDK_RELEASE=="ga")'
+            '!(JDK_VERSION=="22" && JDK_RELEASE=="ga")'
     )
     parameters {
         choiceParam('REPOSITORY', Constants.REPOSITORY, 'Mandrel repo')

diff --git a/jenkins/jobs/builds/mandrel_master_windows_build_matrix.groovy b/jenkins/jobs/builds/mandrel_master_windows_build_matrix.groovy
@@ -5,8 +5,8 @@ matrixJob('mandrel-master-windows-build-matrix') {
         labelExpression('LABEL', ['w2k19'])
         text('JDK_VERSION',
                 '17',
-                '20',
-                '21'
+                '21',
+                '22'
         )
         text('JDK_RELEASE',
                 'ea',
@@ -19,7 +19,7 @@ matrixJob('mandrel-master-windows-build-matrix') {
         numToKeep(5)
     }
     combinationFilter(
-            '!(JDK_VERSION=="21" && JDK_RELEASE=="ga")'
+            '!(JDK_VERSION=="22" && JDK_RELEASE=="ga")'
     )
     parameters {
         choiceParam('REPOSITORY', Constants.REPOSITORY, 'Mandrel repo')

diff --git a/jenkins/jobs/tests/mandrel_linux_integration_tests.groovy b/jenkins/jobs/tests/mandrel_linux_integration_tests.groovy
@@ -4,8 +4,8 @@ matrixJob('mandrel-linux-integration-tests') {
     axes {
         text('JDK_VERSION',
                 '17',
-                '20',
-                '21'
+                '21',
+                '22'
         )
         text('JDK_RELEASE',
                 'ea',

diff --git a/jenkins/jobs/tests/mandrel_linux_integration_tests_perf.groovy b/jenkins/jobs/tests/mandrel_linux_integration_tests_perf.groovy
@@ -6,8 +6,8 @@ matrixJob('mandrel-linux-integration-tests-perf') {
     axes {
         text('JDK_VERSION',
                 '17',
-                '20',
-                '21'
+                '21',
+                '22'
         )
         text('JDK_RELEASE',
                 'ea',

diff --git a/jenkins/jobs/tests/mandrel_linux_quarkus_container_tests.groovy b/jenkins/jobs/tests/mandrel_linux_quarkus_container_tests.groovy
@@ -4,8 +4,9 @@ matrixJob('mandrel-linux-quarkus-container-tests') {
     axes {
         text('BUILDER_IMAGE',
                 'quay.io/quarkus/ubi-quarkus-mandrel-builder-image:22.3-java17',
-                'quay.io/quarkus/ubi-quarkus-mandrel-builder-image:23.1-java17',
-                'quay.io/quarkus/ubi-quarkus-mandrel-builder-image:23.1-java20'
+                'quay.io/quarkus/ubi-quarkus-mandrel-builder-image:23.0-java17',
+                'quay.io/quarkus/ubi-quarkus-mandrel-builder-image:23.0-java20',
+                'quay.io/quarkus/ubi-quarkus-mandrel-builder-image:23.1-java21'
         )
         text('QUARKUS_VERSION', Constants.QUARKUS_VERSION_BUILDER_IMAGE)
         labelExpression('LABEL', ['el8'])

diff --git a/jenkins/jobs/tests/mandrel_linux_quarkus_subset_tests.groovy b/jenkins/jobs/tests/mandrel_linux_quarkus_subset_tests.groovy
@@ -6,8 +6,8 @@ matrixJob('mandrel-linux-quarkus-subset-tests') {
     axes {
         text('JDK_VERSION',
                 '17',
-                '20',
-                '21'
+                '21',
+                '22'
         )
         text('JDK_RELEASE',
                 'ea',

diff --git a/jenkins/jobs/tests/mandrel_linux_quarkus_tests.groovy b/jenkins/jobs/tests/mandrel_linux_quarkus_tests.groovy
@@ -4,8 +4,8 @@ matrixJob('mandrel-linux-quarkus-tests') {
     axes {
         text('JDK_VERSION',
                 '17',
-                '20',
-                '21'
+                '21',
+                '22'
         )
         text('JDK_RELEASE',
                 'ea',

diff --git a/jenkins/jobs/tests/mandrel_windows_integration_tests.groovy b/jenkins/jobs/tests/mandrel_windows_integration_tests.groovy
@@ -4,8 +4,8 @@ matrixJob('mandrel-windows-integration-tests') {
     axes {
         text('JDK_VERSION',
                 '17',
-                '20',
-                '21'
+                '21',
+                '22'
         )
         text('JDK_RELEASE',
                 'ea',

diff --git a/jenkins/jobs/tests/mandrel_windows_quarkus_tests.groovy b/jenkins/jobs/tests/mandrel_windows_quarkus_tests.groovy
@@ -4,8 +4,8 @@ matrixJob('mandrel-windows-quarkus-tests') {
     axes {
         text('JDK_VERSION',
                 '17',
-                '20',
-                '21'
+                '21',
+                '22'
         )
         text('JDK_RELEASE',
                 'ea',
-Original file line number
+Diff line change
@@ Expand Up / @@ -4,8 +4,8 @@ matrixJob('mandrel-linux-integration-tests') { @@
         axes {
             text('JDK_VERSION',
                     '17',
-                    '20',
-                    '21'
+                    '21',
+                    '22'
             )
             text('JDK_RELEASE',
                     'ea',
@@ Expand Down @@