Skip to content

Commit

Permalink
prototype
Browse files Browse the repository at this point in the history
  • Loading branch information
tasso94 committed Oct 15, 2024
1 parent 09e84af commit 41fb1f2
Show file tree
Hide file tree
Showing 7 changed files with 17 additions and 52 deletions.
15 changes: 8 additions & 7 deletions .ci/config/matrices.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand All @@ -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'
Expand Down
6 changes: 4 additions & 2 deletions .ci/config/stage-types.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand All @@ -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,'
Expand Down
2 changes: 1 addition & 1 deletion .ci/daily/Jenkinsfile
Original file line number Diff line number Diff line change
@@ -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 = []

Expand Down
2 changes: 1 addition & 1 deletion .ci/main-trigger/Jenkinsfile
Original file line number Diff line number Diff line change
@@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion .ci/sidetrack/Jenkinsfile
Original file line number Diff line number Diff line change
@@ -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 {
Expand Down
40 changes: 1 addition & 39 deletions Jenkinsfile
Original file line number Diff line number Diff line change
@@ -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 = []

Expand Down Expand Up @@ -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()) {
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 41fb1f2

Please sign in to comment.