From 853f747a3200c8d7a8b7f3ea94904542a982fe53 Mon Sep 17 00:00:00 2001 From: tasso94 <3015690+tasso94@users.noreply.github.com> Date: Thu, 19 Sep 2024 08:58:07 +0200 Subject: [PATCH 1/3] chore(ci): migrate distro-maven and public-nexus stages related to camunda/team-automation-platform#52 --- .ci/daily/Jenkinsfile | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/.ci/daily/Jenkinsfile b/.ci/daily/Jenkinsfile index 38ba05cc5a7..3fe8d59d630 100644 --- a/.ci/daily/Jenkinsfile +++ b/.ci/daily/Jenkinsfile @@ -155,7 +155,10 @@ pipeline { } steps { cambpmConditionalRetry([ - agentLabel: 'h2_perf32', + podSpec: [ + cpu: 32, + image: 'maven:3.9.7-eclipse-temurin-17' + ], runSteps: { cambpmRunMaven('.', "deploy source:jar source:test-jar javadoc:javadoc -Dskip-zip-frontend-sources=true -DaltStagingDirectory=${WORKSPACE}/staging -DskipRemoteStaging=true -B", @@ -186,7 +189,10 @@ pipeline { } steps { cambpmConditionalRetry([ - agentLabel: 'h2_perf32', + podSpec: [ + cpu: 32, + image: 'maven:3.9.7-eclipse-temurin-17' + ], runSteps: { cambpmRunMaven('.', "install source:jar -Pdistro,distro-ce,distro-wildfly,distro-webjar -B", From cd770cadd29fe21941f386243ae5567d31b11338 Mon Sep 17 00:00:00 2001 From: tasso94 <3015690+tasso94@users.noreply.github.com> Date: Thu, 19 Sep 2024 08:59:55 +0200 Subject: [PATCH 2/3] REVERT ME --- .ci/daily/Jenkinsfile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.ci/daily/Jenkinsfile b/.ci/daily/Jenkinsfile index 3fe8d59d630..3e3fff34f5b 100644 --- a/.ci/daily/Jenkinsfile +++ b/.ci/daily/Jenkinsfile @@ -147,12 +147,12 @@ pipeline { } } stage('platform-DISTRO-maven-central') { - when { + /*when { expression { // trigger stage only on the master branch env.BRANCH_NAME == cambpmDefaultBranch() && cambpmIsDevelopmentVersion() } - } + }*/ steps { cambpmConditionalRetry([ podSpec: [ @@ -181,12 +181,12 @@ pipeline { } } stage('platform-public-nexus') { - when { + /*when { expression { // trigger stage only on the master branch env.BRANCH_NAME == cambpmDefaultBranch() && cambpmIsDevelopmentVersion() } - } + }*/ steps { cambpmConditionalRetry([ podSpec: [ From 2fcae50ebea7c2806beb4bd6bbfe5945b82e297b Mon Sep 17 00:00:00 2001 From: tasso94 <3015690+tasso94@users.noreply.github.com> Date: Thu, 19 Sep 2024 10:20:05 +0200 Subject: [PATCH 3/3] SQUASH ME --- .ci/daily/Jenkinsfile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.ci/daily/Jenkinsfile b/.ci/daily/Jenkinsfile index 3e3fff34f5b..3fe8d59d630 100644 --- a/.ci/daily/Jenkinsfile +++ b/.ci/daily/Jenkinsfile @@ -147,12 +147,12 @@ pipeline { } } stage('platform-DISTRO-maven-central') { - /*when { + when { expression { // trigger stage only on the master branch env.BRANCH_NAME == cambpmDefaultBranch() && cambpmIsDevelopmentVersion() } - }*/ + } steps { cambpmConditionalRetry([ podSpec: [ @@ -181,12 +181,12 @@ pipeline { } } stage('platform-public-nexus') { - /*when { + when { expression { // trigger stage only on the master branch env.BRANCH_NAME == cambpmDefaultBranch() && cambpmIsDevelopmentVersion() } - }*/ + } steps { cambpmConditionalRetry([ podSpec: [