(tomee-tck) 07/10: Fold the smoke stages into a JDK matrix

[jungm]

This is an automated email from the ASF dual-hosted git repository.

jungm pushed a commit to branch ee11
in repository https://gitbox.apache.org/repos/asf/tomee-tck.git

commit 5353517db71a4ba37e48e8c4a4c6f5c9a9a11a05
Author: Markus Jung <ju...@apache.org>
AuthorDate: Sat Jul 18 20:28:21 2026 +0200

    Fold the smoke stages into a JDK matrix
---
 Jenkinsfile | 59 +++++++++++++++++++++++------------------------------------
 1 file changed, 23 insertions(+), 36 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index bff7cd7..f99c242 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -62,45 +62,32 @@ from xml.etree import ElementTree
     // Each branch requests a single-executor ephemeral agent. TomEE and Derby
     // use fixed localhost ports, so two partitions must never share a host.
     stage('Smoke') {
-      parallel {
-        stage('JDK 17') {
-          agent { label 'ubuntu && ephemeral' }
-          tools { jdk 'jdk_17_latest' }
-          options { timeout(time: 30, unit: 'MINUTES') }
-          steps {
-            deleteDir()
-            checkout scm
-            sh './mvnw -B -ntp -pl runner-smoke -am verify'
-          }
-          post {
-            always {
-              archiveArtifacts(
-                artifacts: 
'runner-smoke/target/surefire-reports/**/*,runner-smoke/target/failsafe-reports/**/*,runner-smoke/target/**/logs/**/*,runner-smoke/target/*.log',
-                allowEmptyArchive: true
-              )
-              junit(testResults: 'runner-smoke/target/**/TEST-*.xml', 
allowEmptyResults: true)
-              deleteDir()
-            }
+      matrix {
+        axes {
+          axis {
+            name 'SMOKE_JDK'
+            values 'jdk_17_latest', 'jdk_21_latest'
           }
         }
-
-        stage('JDK 21') {
-          agent { label 'ubuntu && ephemeral' }
-          tools { jdk 'jdk_21_latest' }
-          options { timeout(time: 30, unit: 'MINUTES') }
-          steps {
-            deleteDir()
-            checkout scm
-            sh './mvnw -B -ntp -pl runner-smoke -am verify'
-          }
-          post {
-            always {
-              archiveArtifacts(
-                artifacts: 
'runner-smoke/target/surefire-reports/**/*,runner-smoke/target/failsafe-reports/**/*,runner-smoke/target/**/logs/**/*,runner-smoke/target/*.log',
-                allowEmptyArchive: true
-              )
-              junit(testResults: 'runner-smoke/target/**/TEST-*.xml', 
allowEmptyResults: true)
+        stages {
+          stage('smoke') {
+            agent { label 'ubuntu && ephemeral' }
+            tools { jdk "${SMOKE_JDK}" }
+            options { timeout(time: 30, unit: 'MINUTES') }
+            steps {
               deleteDir()
+              checkout scm
+              sh './mvnw -B -ntp -pl runner-smoke -am verify'
+            }
+            post {
+              always {
+                archiveArtifacts(
+                  artifacts: 
'runner-smoke/target/surefire-reports/**/*,runner-smoke/target/failsafe-reports/**/*,runner-smoke/target/**/logs/**/*,runner-smoke/target/*.log',
+                  allowEmptyArchive: true
+                )
+                junit(testResults: 'runner-smoke/target/**/TEST-*.xml', 
allowEmptyResults: true)
+                deleteDir()
+              }
             }
           }
         }