From 26c03581d0ffde60d6568a5a7d76201029442b05 Mon Sep 17 00:00:00 2001 From: Michal Karm Babacek Date: Wed, 18 Sep 2024 10:30:23 +0200 Subject: [PATCH] JDK 23 Mandrel 24.1 in other tests --- .../mandrel_linux_container_integration_tests.groovy | 9 +++++---- .../jobs/tests/mandrel_linux_quarkus_subset_tests.groovy | 1 + jenkins/jobs/tests/mandrel_linux_quarkus_tests.groovy | 1 + jenkins/jobs/tests/mandrel_windows_quarkus_tests.groovy | 1 + 4 files changed, 8 insertions(+), 4 deletions(-) diff --git a/jenkins/jobs/tests/mandrel_linux_container_integration_tests.groovy b/jenkins/jobs/tests/mandrel_linux_container_integration_tests.groovy index a225b3d..5889ee4 100644 --- a/jenkins/jobs/tests/mandrel_linux_container_integration_tests.groovy +++ b/jenkins/jobs/tests/mandrel_linux_container_integration_tests.groovy @@ -3,10 +3,11 @@ final Class Constants = new GroovyClassLoader(getClass().getClassLoader()) matrixJob('mandrel-linux-container-integration-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.0-java17', - 'quay.io/quarkus/ubi-quarkus-mandrel-builder-image:23.1-java21', - 'quay.io/quarkus/ubi-quarkus-mandrel-builder-image:24.0-java22' + 'quay.io/quarkus/ubi-quarkus-mandrel-builder-image:jdk-17', + 'quay.io/quarkus/ubi-quarkus-mandrel-builder-image:jdk-21', + 'quay.io/quarkus/ubi-quarkus-mandrel-builder-image:jdk-22', + 'quay.io/quarkus/ubi-quarkus-mandrel-builder-image:jdk-23', + 'quay.io/quarkus/ubi-quarkus-mandrel-builder-image:jdk-24' ) text('QUARKUS_VERSION', Constants.QUARKUS_VERSION_RELEASED) labelExpression('LABEL', ['el8', 'el8_aarch64']) diff --git a/jenkins/jobs/tests/mandrel_linux_quarkus_subset_tests.groovy b/jenkins/jobs/tests/mandrel_linux_quarkus_subset_tests.groovy index 506653d..fd2c087 100644 --- a/jenkins/jobs/tests/mandrel_linux_quarkus_subset_tests.groovy +++ b/jenkins/jobs/tests/mandrel_linux_quarkus_subset_tests.groovy @@ -19,6 +19,7 @@ matrixJob('mandrel-linux-quarkus-subset-tests') { 'mandrel-23-0-linux-build-matrix', 'mandrel-23-1-linux-build-matrix', 'mandrel-24-0-linux-build-matrix', + 'mandrel-24-1-linux-build-matrix', 'mandrel-master-linux-build-matrix' ) text('QUARKUS_VERSION', Constants.QUARKUS_VERSION_RELEASED) diff --git a/jenkins/jobs/tests/mandrel_linux_quarkus_tests.groovy b/jenkins/jobs/tests/mandrel_linux_quarkus_tests.groovy index bc36385..647ef5e 100644 --- a/jenkins/jobs/tests/mandrel_linux_quarkus_tests.groovy +++ b/jenkins/jobs/tests/mandrel_linux_quarkus_tests.groovy @@ -17,6 +17,7 @@ matrixJob('mandrel-linux-quarkus-tests') { 'mandrel-23-0-linux-build-matrix', 'mandrel-23-1-linux-build-matrix', 'mandrel-24-0-linux-build-matrix', + 'mandrel-24-1-linux-build-matrix', 'mandrel-master-linux-build-matrix' ) text('QUARKUS_VERSION', Constants.QUARKUS_VERSION_RELEASED) diff --git a/jenkins/jobs/tests/mandrel_windows_quarkus_tests.groovy b/jenkins/jobs/tests/mandrel_windows_quarkus_tests.groovy index 0371fb6..54358d2 100644 --- a/jenkins/jobs/tests/mandrel_windows_quarkus_tests.groovy +++ b/jenkins/jobs/tests/mandrel_windows_quarkus_tests.groovy @@ -17,6 +17,7 @@ matrixJob('mandrel-windows-quarkus-tests') { 'mandrel-23-0-windows-build-matrix', 'mandrel-23-1-windows-build-matrix', 'mandrel-24-0-windows-build-matrix', + 'mandrel-24-1-windows-build-matrix', 'mandrel-master-windows-build-matrix' ) text('QUARKUS_VERSION', Constants.QUARKUS_VERSION_RELEASED)