diff --git a/.ci/config/matrices.yaml b/.ci/config/matrices.yaml index a9d013ae863..237116a766c 100644 --- a/.ci/config/matrices.yaml +++ b/.ci/config/matrices.yaml @@ -6,11 +6,12 @@ engine-webapp-unit: # engine-webapp-unit.databases should include all supported database versions databases: - - 'postgresql_142' - - 'postgresql_150' - - 'postgresql_160' - - 'aws_aurora_postgresql_14' - - 'aws_aurora_postgresql_15' + #- 'postgresql_142' + #- 'postgresql_150' + #- 'postgresql_160' + - 'postgresql_170' + #- 'aws_aurora_postgresql_14' + #- 'aws_aurora_postgresql_15' - 'mariadb_106' - 'mysql_80' - 'oracle_19' @@ -32,8 +33,8 @@ engine-rest: daily-stages: databases: # daily-stages.databases should include the latest version for each supported database - - 'postgresql_160' - - 'aws_aurora_postgresql_15' + - 'postgresql_170' + #- 'aws_aurora_postgresql_15' - 'mariadb_106' - 'mysql_80' - 'oracle_23' diff --git a/.ci/config/stage-types.yaml b/.ci/config/stage-types.yaml index 2586ed0bd8f..de987da3473 100644 --- a/.ci/config/stage-types.yaml +++ b/.ci/config/stage-types.yaml @@ -23,7 +23,7 @@ db-unit: directory: '.' command: 'clean package -pl "engine,webapps/assembly,webapps/assembly-jakarta" -Dskip.frontend.build=true -P' stash: - runtimeStash: true + runtimeStash: false labels: - 'all-db' - 'db2' @@ -32,7 +32,9 @@ db-unit: - 'mariadb' - 'sqlserver' - 'postgresql' - jdkVersion: 'openjdk-jdk-11-latest' + podSpec: + cpu: 4 + image: 'maven:3.8.5-eclipse-temurin-11' sql-scripts: directory: 'distro/sql-script' command: 'install -Pcheck-sql,' diff --git a/.ci/daily/Jenkinsfile b/.ci/daily/Jenkinsfile index 08657e2d251..03a89d710b4 100644 --- a/.ci/daily/Jenkinsfile +++ b/.ci/daily/Jenkinsfile @@ -1,6 +1,6 @@ // https://github.com/camunda/jenkins-global-shared-library // https://github.com/camunda/cambpm-jenkins-shared-library -@Library(['camunda-ci', 'cambpm-jenkins-shared-library']) _ +@Library(['camunda-ci', 'cambpm-jenkins-shared-library@postgresql-17-declarative-pod-specs']) _ def failedStageTypes = [] diff --git a/.ci/main-trigger/Jenkinsfile b/.ci/main-trigger/Jenkinsfile index ee290d7defb..a0fed60f61e 100644 --- a/.ci/main-trigger/Jenkinsfile +++ b/.ci/main-trigger/Jenkinsfile @@ -1,6 +1,6 @@ // https://github.com/camunda/jenkins-global-shared-library // https://github.com/camunda/cambpm-jenkins-shared-library -@Library(['camunda-ci', 'cambpm-jenkins-shared-library']) _ +@Library(['camunda-ci', 'cambpm-jenkins-shared-library@postgresql-17-declarative-pod-specs']) _ pipeline { agent { diff --git a/.ci/sidetrack/Jenkinsfile b/.ci/sidetrack/Jenkinsfile index 1caf22886ee..69a22e50a1c 100644 --- a/.ci/sidetrack/Jenkinsfile +++ b/.ci/sidetrack/Jenkinsfile @@ -1,6 +1,6 @@ // https://github.com/camunda/jenkins-global-shared-library // https://github.com/camunda/cambpm-jenkins-shared-library -@Library(['camunda-ci', 'cambpm-jenkins-shared-library']) _ +@Library(['camunda-ci', 'cambpm-jenkins-shared-library@postgresql-17-declarative-pod-specs']) _ pipeline { agent { diff --git a/Jenkinsfile b/Jenkinsfile index 809c02dfa21..eb58fb0ea56 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -1,6 +1,6 @@ // https://github.com/camunda/jenkins-global-shared-library // https://github.com/camunda/cambpm-jenkins-shared-library -@Library(['camunda-ci', 'cambpm-jenkins-shared-library']) _ +@Library(['camunda-ci', 'cambpm-jenkins-shared-library@postgresql-17-declarative-pod-specs']) _ def failedStageTypes = [] @@ -47,45 +47,7 @@ pipeline { if (env.CHANGE_ID != null && pullRequest.labels.contains('ci:skipTests')) { skipTests = "-DskipTests " } - withVault([vaultSecrets: [ - [ - path : 'secret/products/cambpm/ci/xlts.dev', - secretValues: [ - [envVar: 'XLTS_REGISTRY', vaultKey: 'registry'], - [envVar: 'XLTS_AUTH_TOKEN', vaultKey: 'authToken']] - ]]]) { - cambpmRunMaven('.', - '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 '+ skipTests, - withCatch: false, - withNpm: true, - // 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 11 in the release parents - jdkVersion: 'jdk-17-latest') - } - - // archive all .jar, .pom, .xml, .txt runtime artifacts + required .war/.zip/.tar.gz for EE pipeline - // add a new line for each group of artifacts - cambpmArchiveArtifacts('.m2/org/camunda/**/*-SNAPSHOT/**/*.jar,.m2/org/camunda/**/*-SNAPSHOT/**/*.pom,.m2/org/camunda/**/*-SNAPSHOT/**/*.xml,.m2/org/camunda/**/*-SNAPSHOT/**/*.txt', - '.m2/org/camunda/**/*-SNAPSHOT/**/camunda-webapp*frontend-sources.zip', - '.m2/org/camunda/**/*-SNAPSHOT/**/license-book*.zip', - '.m2/org/camunda/**/*-SNAPSHOT/**/camunda-*-assembly*.tar.gz', - '.m2/org/camunda/**/*-SNAPSHOT/**/camunda-webapp*.war', - '.m2/org/camunda/**/*-SNAPSHOT/**/camunda-engine-rest*.war', - '.m2/org/camunda/**/*-SNAPSHOT/**/camunda-example-invoice*.war') - if (env.CHANGE_ID != null && pullRequest.labels.contains('ci:distro')) { - cambpmArchiveArtifacts( - '.m2/org/camunda/**/*-SNAPSHOT/**/camunda-bpm-*.zip', - '.m2/org/camunda/**/*-SNAPSHOT/**/camunda-bpm-*.tar.gz') - } - cambpmStash("platform-stash-runtime", - ".m2/org/camunda/**/*-SNAPSHOT/**", - "**/qa/**,**/*qa*/**,**/*.zip,**/*.tar.gz") - cambpmStash("platform-stash-archives", - ".m2/org/camunda/bpm/**/*-SNAPSHOT/**/*.zip,.m2/org/camunda/bpm/**/*-SNAPSHOT/**/*.tar.gz") - cambpmStash("platform-stash-qa", - ".m2/org/camunda/bpm/**/qa/**/*-SNAPSHOT/**,.m2/org/camunda/bpm/**/*qa*/**/*-SNAPSHOT/**", - "**/*.zip,**/*.tar.gz") script { if (env.BRANCH_NAME == cambpmDefaultBranch()) { diff --git a/engine-rest/engine-rest-jakarta/pom.xml b/engine-rest/engine-rest-jakarta/pom.xml index 1a2ec754e1b..937c5003e11 100644 --- a/engine-rest/engine-rest-jakarta/pom.xml +++ b/engine-rest/engine-rest-jakarta/pom.xml @@ -719,4 +719,4 @@ - \ No newline at end of file +