diff --git a/.ci/config/matrices.yaml b/.ci/config/matrices.yaml index ceada43c193..491dacb0c7c 100644 --- a/.ci/config/matrices.yaml +++ b/.ci/config/matrices.yaml @@ -59,9 +59,6 @@ sidetrack-stages: - 'rolling-update' jdk-ce-stages: stages: - - 'platform-jdk-openjdk-jdk-21-latest' - - 'platform-jdk-openjdk-jdk-17-latest' - - 'platform-jdk-openjdk-jdk-11-latest' - - 'platform-jdk-jdk-21-latest' - - 'platform-jdk-jdk-17-latest' - - 'platform-jdk-jdk-11-latest' + - 'platform-jdk-temurin-jdk-21-latest' + - 'platform-jdk-temurin-jdk-17-latest' + - 'platform-jdk-temurin-jdk-11-latest' diff --git a/.ci/config/stage-types.yaml b/.ci/config/stage-types.yaml index 9c827ac0d30..7e06b9a1564 100644 --- a/.ci/config/stage-types.yaml +++ b/.ci/config/stage-types.yaml @@ -130,60 +130,27 @@ engine-rest-jakarta-unit-compatibility-wildfly: - 'rest-api' nodeLabel: 'h2' jdkVersion: 'openjdk-jdk-17-latest' -platform-jdk-openjdk-jdk-17-latest: +platform-jdk-temurin-jdk-17-latest: directory: '.' command: 'install source:jar source:test-jar -Pdistro,distro-ce,distro-wildfly' stash: runtimeStash: true - nodeLabel: 'h2' - jdkVersion: 'openjdk-jdk-17-latest' - withNpm: true -platform-jdk-openjdk-jdk-21-latest: - directory: '.' - command: 'install source:jar source:test-jar -Pdistro,distro-ce,distro-wildfly' - stash: - runtimeStash: true - nodeLabel: 'h2' - jdkVersion: 'openjdk-jdk-21-latest' - withNpm: true -platform-jdk-openjdk-jdk-11-latest: - directory: '.' - command: 'install source:jar source:test-jar - -pl ''!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-security, - !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/webapps,!distro/run/modules/oauth2,!distro/run/qa,!distro/run/qa/integration-tests, - !distro/run/qa/runtime,!distro/run/qa/example-plugin'' - -Pdistro,distro-ce,distro-wildfly' - stash: - runtimeStash: true - nodeLabel: 'h2' - jdkVersion: 'openjdk-jdk-11-latest' withNpm: true -platform-jdk-jdk-17-latest: - directory: '.' - command: 'install source:jar source:test-jar -Pdistro,distro-ce,distro-wildfly' - stash: - runtimeStash: true - nodeLabel: 'h2' jdkVersion: 'jdk-17-latest' - withNpm: true -platform-jdk-jdk-21-latest: + podSpec: + cpu: 4 + image: 'maven:3.9.7-eclipse-temurin-17' +platform-jdk-temurin-jdk-21-latest: directory: '.' command: 'install source:jar source:test-jar -Pdistro,distro-ce,distro-wildfly' stash: runtimeStash: true - nodeLabel: 'h2' - jdkVersion: 'jdk-21-latest' withNpm: true -platform-jdk-jdk-11-latest: + jdkVersion: 'jdk-21-latest' + podSpec: + cpu: 4 + image: 'maven:3.9.7-eclipse-temurin-21' +platform-jdk-temurin-jdk-11-latest: directory: '.' command: 'install source:jar source:test-jar -pl ''!spring-boot-starter,!spring-boot-starter/starter,!spring-boot-starter/starter-client/spring,!spring-boot-starter/starter-client/spring-boot, @@ -201,6 +168,9 @@ platform-jdk-jdk-11-latest: -Pdistro,distro-ce,distro-wildfly' stash: runtimeStash: true - nodeLabel: 'h2' - jdkVersion: 'jdk-11-latest' withNpm: true + jdkVersion: 'jdk-11-latest' + podSpec: + cpu: 4 + image: 'maven:3.9.7-eclipse-temurin-11' + diff --git a/.ci/daily/Jenkinsfile b/.ci/daily/Jenkinsfile index cc31f74ae0b..38ba05cc5a7 100644 --- a/.ci/daily/Jenkinsfile +++ b/.ci/daily/Jenkinsfile @@ -93,7 +93,10 @@ pipeline { } steps { cambpmConditionalRetry([ - agentLabel : 'centos-stable', + podSpec: [ + cpu: 4, + image: 'maven:3.9.7-eclipse-temurin-11' + ], runSteps : { cambpmRunMaven('./engine-rest', "package -Dmaven.test.skip -pl '!engine-rest,!assembly'", diff --git a/Jenkinsfile b/Jenkinsfile index 0a3cd9925ac..809c02dfa21 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -36,9 +36,13 @@ pipeline { } steps { cambpmConditionalRetry([ - agentLabel: 'h2_perf32', + podSpec: [ + cpu: 32, + image: 'maven:3.9.7-eclipse-temurin-17' + ], suppressErrors: false, runSteps: { + sh(label: 'GIT: Mark current directory as safe', script: "git config --global --add safe.directory \$PWD") skipTests = "" if (env.CHANGE_ID != null && pullRequest.labels.contains('ci:skipTests')) { skipTests = "-DskipTests " diff --git a/parent/pom.xml b/parent/pom.xml index 28631c71663..1c1f6e432f5 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -75,8 +75,8 @@ 10.0.0 1.12.1 - 17.9.1 - 8.11.0 + 20.14.0 + 10.7.0