chore(ci): run Assembly, spring-boot-starter, and run stages with JDK…

… 17 (camunda#3452) * Assembly CI stage uses JDK 17 (the compiler source and target are set in the release parents). * spring-boot-starter and run stages run on JDK 17 * add tomcat and all-as CI labels to spring boot relevant stages * exclude starter, run, assert from daily jdk stages < jdk 17 Related to camunda#3433
yhao3 · Jun 7, 2023 · 8ef54e6 · 8ef54e6
1 parent 2a3b530
commit 8ef54e6
Show file tree

Hide file tree

Showing 2 changed files with 82 additions and 11 deletions.
diff --git a/.ci/config/stage-types.yaml b/.ci/config/stage-types.yaml
@@ -143,7 +143,22 @@ platform-jdk-openjdk-jdk-17-latest:
   withNpm: true
 platform-jdk-openjdk-jdk-11-latest:
   directory: '.'
-  command: 'install source:jar source:test-jar -pl ''!webapps/assembly'',''!webapps/assembly-jakarta'' -Pdistro,distro-ce,distro-wildfly'
+  command: 'install source:jar source:test-jar
+    -pl ''!webapps/assembly,!webapps/assembly-jakarta,
+          !spring-boot-starter,!spring-boot-starter/starter,!spring-boot-starter/starter-client/spring,!spring-boot-starter/starter-client/spring-boot,
+          !spring-boot-starter/starter-qa,!spring-boot-starter/starter-rest,!spring-boot-starter/starter-test,!spring-boot-starter/starter-webapp,
+          !spring-boot-starter/starter-webapp-core,
+          !spring-boot-starter/starter-qa/integration-test-liquibase,!spring-boot-starter/starter-qa/integration-test-plugins,
+          !spring-boot-starter/starter-qa/integration-test-plugins/spin,!spring-boot-starter/starter-qa/integration-test-plugins/spin/spin-dataformat-all,
+          !spring-boot-starter/starter-qa/integration-test-plugins/spin/spin-dataformat-json-jackson,
+          !spring-boot-starter/starter-qa/integration-test-request-scope,!spring-boot-starter/starter-qa/integration-test-simple,
+          !spring-boot-starter/starter-qa/integration-test-webapp,!spring-boot-starter/starter-qa/integration-test-webapp/invoice-example,
+          !spring-boot-starter/starter-qa/integration-test-webapp/runtime,
+          !distro/run,!distro/run/assembly,!distro/run/core,!distro/run/distro,!distro/run/modules,!distro/run/modules/example,
+          !distro/run/modules/rest,!distro/run/modules/swaggerui,!distro/run/modules/webapps,!distro/run/qa,!distro/run/qa/integration-tests,
+          !distro/run/qa/runtime,
+          !test-utils/assert,!test-utils/assert/core,!test-utils/assert/qa''
+    -Pdistro,distro-ce,distro-wildfly'
   stash:
     runtimeStash: true
   nodeLabel: 'h2'
@@ -154,7 +169,20 @@ platform-jdk-openjdk-jdk-8-latest:
   command: 'install source:jar source:test-jar
     -pl ''!distro/wildfly,!distro/wildfly/subsystem,!distro/wildfly/modules,!distro/wildfly/assembly,!distro/wildfly/webapp,!distro/wildfly/distro,
           !qa/integration-tests-engine-jakarta,!webapps/assembly,
-          !quarkus-extension/engine/deployment,!quarkus-extension/engine/runtime,!quarkus-extension/engine/qa'' 
+          !quarkus-extension/engine/deployment,!quarkus-extension/engine/runtime,!quarkus-extension/engine/qa,
+          !spring-boot-starter,!spring-boot-starter/starter,!spring-boot-starter/starter-client/spring,!spring-boot-starter/starter-client/spring-boot,
+          !spring-boot-starter/starter-qa,!spring-boot-starter/starter-rest,!spring-boot-starter/starter-test,!spring-boot-starter/starter-webapp,
+          !spring-boot-starter/starter-webapp-core,
+          !spring-boot-starter/starter-qa/integration-test-liquibase,!spring-boot-starter/starter-qa/integration-test-plugins,
+          !spring-boot-starter/starter-qa/integration-test-plugins/spin,!spring-boot-starter/starter-qa/integration-test-plugins/spin/spin-dataformat-all,
+          !spring-boot-starter/starter-qa/integration-test-plugins/spin/spin-dataformat-json-jackson,
+          !spring-boot-starter/starter-qa/integration-test-request-scope,!spring-boot-starter/starter-qa/integration-test-simple,
+          !spring-boot-starter/starter-qa/integration-test-webapp,!spring-boot-starter/starter-qa/integration-test-webapp/invoice-example,
+          !spring-boot-starter/starter-qa/integration-test-webapp/runtime,
+          !distro/run,!distro/run/assembly,!distro/run/core,!distro/run/distro,!distro/run/modules,!distro/run/modules/example,
+          !distro/run/modules/rest,!distro/run/modules/swaggerui,!distro/run/modules/webapps,!distro/run/qa,!distro/run/qa/integration-tests,
+          !distro/run/qa/runtime,
+          !test-utils/assert,!test-utils/assert/core,!test-utils/assert/qa'' 
     -Pdistro,distro-ce,distro-wildfly'
   stash:
     runtimeStash: true
@@ -171,7 +199,22 @@ platform-jdk-jdk-17-latest:
   withNpm: true
 platform-jdk-jdk-11-latest:
   directory: '.'
-  command: 'install source:jar source:test-jar -pl ''!webapps/assembly'',''!webapps/assembly-jakarta'' -Pdistro,distro-ce,distro-wildfly'
+  command: 'install source:jar source:test-jar
+    -pl ''!webapps/assembly,!webapps/assembly-jakarta,
+          !spring-boot-starter,!spring-boot-starter/starter,!spring-boot-starter/starter-client/spring,!spring-boot-starter/starter-client/spring-boot,
+          !spring-boot-starter/starter-qa,!spring-boot-starter/starter-rest,!spring-boot-starter/starter-test,!spring-boot-starter/starter-webapp,
+          !spring-boot-starter/starter-webapp-core,
+          !spring-boot-starter/starter-qa/integration-test-liquibase,!spring-boot-starter/starter-qa/integration-test-plugins,
+          !spring-boot-starter/starter-qa/integration-test-plugins/spin,!spring-boot-starter/starter-qa/integration-test-plugins/spin/spin-dataformat-all,
+          !spring-boot-starter/starter-qa/integration-test-plugins/spin/spin-dataformat-json-jackson,
+          !spring-boot-starter/starter-qa/integration-test-request-scope,!spring-boot-starter/starter-qa/integration-test-simple,
+          !spring-boot-starter/starter-qa/integration-test-webapp,!spring-boot-starter/starter-qa/integration-test-webapp/invoice-example,
+          !spring-boot-starter/starter-qa/integration-test-webapp/runtime,
+          !distro/run,!distro/run/assembly,!distro/run/core,!distro/run/distro,!distro/run/modules,!distro/run/modules/example,
+          !distro/run/modules/rest,!distro/run/modules/swaggerui,!distro/run/modules/webapps,!distro/run/qa,!distro/run/qa/integration-tests,
+          !distro/run/qa/runtime,
+          !test-utils/assert,!test-utils/assert/core,!test-utils/assert/qa''
+    -Pdistro,distro-ce,distro-wildfly'
   stash:
     runtimeStash: true
   nodeLabel: 'h2'
@@ -182,7 +225,20 @@ platform-jdk-jdk-8-latest:
   command: 'install source:jar source:test-jar
     -pl ''!distro/wildfly,!distro/wildfly/subsystem,!distro/wildfly/modules,!distro/wildfly/assembly,!distro/wildfly/webapp,!distro/wildfly/distro,
           !qa/integration-tests-engine-jakarta,!webapps/assembly,
-          !quarkus-extension/engine/deployment,!quarkus-extension/engine/runtime,!quarkus-extension/engine/qa''
+          !quarkus-extension/engine/deployment,!quarkus-extension/engine/runtime,!quarkus-extension/engine/qa,
+          !spring-boot-starter,!spring-boot-starter/starter,!spring-boot-starter/starter-client/spring,!spring-boot-starter/starter-client/spring-boot,
+          !spring-boot-starter/starter-qa,!spring-boot-starter/starter-rest,!spring-boot-starter/starter-test,!spring-boot-starter/starter-webapp,
+          !spring-boot-starter/starter-webapp-core,
+          !spring-boot-starter/starter-qa/integration-test-liquibase,!spring-boot-starter/starter-qa/integration-test-plugins,
+          !spring-boot-starter/starter-qa/integration-test-plugins/spin,!spring-boot-starter/starter-qa/integration-test-plugins/spin/spin-dataformat-all,
+          !spring-boot-starter/starter-qa/integration-test-plugins/spin/spin-dataformat-json-jackson,
+          !spring-boot-starter/starter-qa/integration-test-request-scope,!spring-boot-starter/starter-qa/integration-test-simple,
+          !spring-boot-starter/starter-qa/integration-test-webapp,!spring-boot-starter/starter-qa/integration-test-webapp/invoice-example,
+          !spring-boot-starter/starter-qa/integration-test-webapp/runtime,
+          !distro/run,!distro/run/assembly,!distro/run/core,!distro/run/distro,!distro/run/modules,!distro/run/modules/example,
+          !distro/run/modules/rest,!distro/run/modules/swaggerui,!distro/run/modules/webapps,!distro/run/qa,!distro/run/qa/integration-tests,
+          !distro/run/qa/runtime,
+          !test-utils/assert,!test-utils/assert/core,!test-utils/assert/qa''
     -Pdistro,distro-ce,distro-wildfly'
   stash:
     runtimeStash: true
@@ -194,7 +250,20 @@ platform-jdk-ibm-jdk-8-latest:
   command: 'install source:jar source:test-jar
     -pl ''!distro/wildfly,!distro/wildfly/subsystem,!distro/wildfly/modules,!distro/wildfly/assembly,!distro/wildfly/webapp,!distro/wildfly/distro,
           !qa/integration-tests-engine-jakarta,!webapps/assembly,
-          !quarkus-extension/engine/deployment,!quarkus-extension/engine/runtime,!quarkus-extension/engine/qa''
+          !quarkus-extension/engine/deployment,!quarkus-extension/engine/runtime,!quarkus-extension/engine/qa,
+          !spring-boot-starter,!spring-boot-starter/starter,!spring-boot-starter/starter-client/spring,!spring-boot-starter/starter-client/spring-boot,
+          !spring-boot-starter/starter-qa,!spring-boot-starter/starter-rest,!spring-boot-starter/starter-test,!spring-boot-starter/starter-webapp,
+          !spring-boot-starter/starter-webapp-core,
+          !spring-boot-starter/starter-qa/integration-test-liquibase,!spring-boot-starter/starter-qa/integration-test-plugins,
+          !spring-boot-starter/starter-qa/integration-test-plugins/spin,!spring-boot-starter/starter-qa/integration-test-plugins/spin/spin-dataformat-all,
+          !spring-boot-starter/starter-qa/integration-test-plugins/spin/spin-dataformat-json-jackson,
+          !spring-boot-starter/starter-qa/integration-test-request-scope,!spring-boot-starter/starter-qa/integration-test-simple,
+          !spring-boot-starter/starter-qa/integration-test-webapp,!spring-boot-starter/starter-qa/integration-test-webapp/invoice-example,
+          !spring-boot-starter/starter-qa/integration-test-webapp/runtime,
+          !distro/run,!distro/run/assembly,!distro/run/core,!distro/run/distro,!distro/run/modules,!distro/run/modules/example,
+          !distro/run/modules/rest,!distro/run/modules/swaggerui,!distro/run/modules/webapps,!distro/run/qa,!distro/run/qa/integration-tests,
+          !distro/run/qa/runtime,
+          !test-utils/assert,!test-utils/assert/core,!test-utils/assert/qa''
     -Pdistro,distro-ce,distro-wildfly'
   stash:
     runtimeStash: true

diff --git a/Jenkinsfile b/Jenkinsfile
@@ -49,9 +49,9 @@ pipeline {
                   'clean source:jar deploy source:test-jar com.mycila:license-maven-plugin:check -Pdistro,distro-ce,distro-wildfly,distro-webjar,h2-in-memory -DaltStagingDirectory=${WORKSPACE}/staging -DskipRemoteStaging=true',
                   withCatch: false,
                   withNpm: true,
-                  // we use JDK 11 to build the artifacts, as it is required by the Quarkus extension
+                  // we use JDK 17 to build the artifacts, as it is required for supporting Spring Boot 3
                   // the compiler source and target is set to JDK 8 in the release parents
-                  jdkVersion: 'jdk-11-latest')
+                  jdkVersion: 'jdk-17-latest')
             }
 
             // archive all .jar, .pom, .xml, .txt runtime artifacts + required .war/.zip/.tar.gz for EE pipeline
@@ -404,14 +404,15 @@ pipeline {
         stage('camunda-run-IT') {
           when {
             expression {
-              cambpmWithLabels('run')
+              cambpmWithLabels('run', 'spring-boot', 'tomcat', 'all-as')
             }
           }
           steps {
             cambpmConditionalRetry([
               agentLabel: 'chrome_112',
               runSteps: {
-                cambpmRunMaven('distro/run/', 'clean install -Pintegration-test-camunda-run', runtimeStash: true, archiveStash: true, qaStash: true)
+                cambpmRunMaven('distro/run/', 'clean install -Pintegration-test-camunda-run', runtimeStash: true, archiveStash: true, qaStash: true,
+                    jdkVersion: 'jdk-17-latest')
               },
               postFailure: {
                 cambpmPublishTestResult()
@@ -423,14 +424,15 @@ pipeline {
         stage('spring-boot-starter-IT') {
           when {
             expression {
-              cambpmWithLabels('spring-boot')
+              cambpmWithLabels('spring-boot', 'tomcat', 'all-as')
             }
           }
           steps {
             cambpmConditionalRetry([
               agentLabel: 'chrome_112',
               runSteps: {
-                cambpmRunMaven('spring-boot-starter/', 'clean install -Pintegration-test-spring-boot-starter', runtimeStash: true, archiveStash: true, qaStash: true)
+                cambpmRunMaven('spring-boot-starter/', 'clean install -Pintegration-test-spring-boot-starter', runtimeStash: true, archiveStash: true, qaStash: true,
+                    jdkVersion: 'jdk-17-latest')
               },
               postFailure: {
                 cambpmPublishTestResult()