Skip to content

Commit

Permalink
feat(root): Add Postgres 17
Browse files Browse the repository at this point in the history
- Adds Postgres 17 support using the multi-node podspec execution mode
- Adapts the podspec config of the client files (Jenkins files, stage-types.yml) to `images` of the jenkins-shared-library

See related commit of jenkins-shared-library: camunda/cambpm-jenkins-shared-library@d886a17

Related-to: #4165
  • Loading branch information
tasso94 authored Nov 13, 2024
1 parent 54ebf83 commit 5592755
Show file tree
Hide file tree
Showing 5 changed files with 29 additions and 10 deletions.
3 changes: 2 additions & 1 deletion .ci/config/matrices.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ engine-webapp-unit:
- 'postgresql_142'
- 'postgresql_150'
- 'postgresql_160'
- 'postgresql_170'
- 'aws_aurora_postgresql_14'
- 'aws_aurora_postgresql_15'
- 'aws_aurora_postgresql_16'
Expand All @@ -33,7 +34,7 @@ engine-rest:
daily-stages:
databases:
# daily-stages.databases should include the latest version for each supported database
- 'postgresql_160'
- 'postgresql_170'
- 'aws_aurora_postgresql_16'
- 'mariadb_106'
- 'mysql_80'
Expand Down
23 changes: 19 additions & 4 deletions .ci/config/stage-types.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,9 @@ db-unit:
- 'mariadb'
- 'sqlserver'
- 'postgresql'
jdkVersion: 'openjdk-jdk-11-latest'
podSpec:
cpu: 4
images: ['maven:3.9.7-eclipse-temurin-11', 'postgres:17.0']
sql-scripts:
directory: 'distro/sql-script'
command: 'install -Pcheck-sql,'
Expand All @@ -46,6 +48,9 @@ sql-scripts:
- 'mariadb'
- 'sqlserver'
- 'postgresql'
podSpec:
cpu: 4
images: ['maven:3.9.7-eclipse-temurin-11', 'postgres:17.0']
instance-migration:
directory: 'qa/test-db-instance-migration'
command: 'verify -Pinstance-migration,'
Expand All @@ -65,17 +70,27 @@ old-engine:
- 'mariadb'
- 'sqlserver'
- 'postgresql'
podSpec:
cpu: 4
images: ['maven:3.9.7-eclipse-temurin-11', 'postgres:17.0']
rolling-update:
directory: 'qa/test-db-rolling-update'
command: 'verify -Prolling-update,'
stash:
runtimeStash: true
qaStash: true
podSpec:
cpu: 4
images: [ 'maven:3.9.7-eclipse-temurin-11', 'postgres:17.0' ]
large-data-tests:
directory: 'qa/large-data-tests'
command: 'verify -Plarge-data-tests,'
stash:
runtimeStash: true
podSpec:
cpu: 4
images: [ 'maven:3.9.7-eclipse-temurin-11', 'postgres:17.0' ]

engine-rest-unit-jersey-2:
directory: 'engine-rest/engine-rest'
command: 'clean install -Pjersey2'
Expand Down Expand Up @@ -139,7 +154,7 @@ platform-jdk-temurin-jdk-17-latest:
jdkVersion: 'jdk-17-latest'
podSpec:
cpu: 4
image: 'maven:3.9.7-eclipse-temurin-17'
images: ['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'
Expand All @@ -149,7 +164,7 @@ platform-jdk-temurin-jdk-21-latest:
jdkVersion: 'jdk-21-latest'
podSpec:
cpu: 4
image: 'maven:3.9.7-eclipse-temurin-21'
images: ['maven:3.9.7-eclipse-temurin-21']
platform-jdk-temurin-jdk-11-latest:
directory: '.'
command: 'install source:jar source:test-jar
Expand All @@ -172,7 +187,7 @@ platform-jdk-temurin-jdk-11-latest:
jdkVersion: 'jdk-11-latest'
podSpec:
cpu: 4
image: 'maven:3.9.7-eclipse-temurin-11'
images: ['maven:3.9.7-eclipse-temurin-11']
platform-jdk-jdk-17-latest:
directory: '.'
command: 'install source:jar source:test-jar -Pdistro,distro-ce,distro-wildfly -Dskip.frontend.build=true'
Expand Down
6 changes: 3 additions & 3 deletions .ci/daily/Jenkinsfile
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ pipeline {
cambpmConditionalRetry([
podSpec: [
cpu: 4,
image: 'alpine:3.20'
images: ['alpine:3.20']
],
runSteps : {
sh "apk -U add openjdk17-jdk maven rsync openssh libstdc++ libgcc bash"
Expand Down Expand Up @@ -158,7 +158,7 @@ pipeline {
cambpmConditionalRetry([
podSpec: [
cpu: 32,
image: 'maven:3.9.7-eclipse-temurin-17'
images: ['maven:3.9.7-eclipse-temurin-17']
],
runSteps: {
cambpmRunMaven('.',
Expand Down Expand Up @@ -192,7 +192,7 @@ pipeline {
cambpmConditionalRetry([
podSpec: [
cpu: 32,
image: 'maven:3.9.7-eclipse-temurin-17'
images: ['maven:3.9.7-eclipse-temurin-17']
],
runSteps: {
cambpmRunMaven('.',
Expand Down
5 changes: 4 additions & 1 deletion Jenkinsfile
Original file line number Diff line number Diff line change
Expand Up @@ -38,15 +38,17 @@ pipeline {
cambpmConditionalRetry([
podSpec: [
cpu: 32,
image: 'maven:3.9.7-eclipse-temurin-17'
images: ['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 "
}

withVault([vaultSecrets: [
[
path : 'secret/products/cambpm/ci/xlts.dev',
Expand All @@ -72,6 +74,7 @@ pipeline {
'.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',
Expand Down
2 changes: 1 addition & 1 deletion engine-rest/engine-rest-jakarta/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -719,4 +719,4 @@
</profile>
</profiles>

</project>
</project>

0 comments on commit 5592755

Please sign in to comment.