From 86897136abf71c00c67005e4d0abd073a46e577f Mon Sep 17 00:00:00 2001 From: Olivier Lamy Date: Fri, 11 Oct 2024 12:05:48 +1000 Subject: [PATCH] disable eclipse dash for now (#12373) --- Jenkinsfile | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 9301838efc89..2a9ac0ddbddb 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -127,7 +127,11 @@ def mavenBuild(jdk, cmdline, mvnName) { } runLaunchable ("verify") runLaunchable ("record build --name jetty-12.0.x") - sh "mvn $extraArgs -DsettingsPath=$GLOBAL_MVN_SETTINGS -Dmaven.repo.uri=http://nexus-service.nexus.svc.cluster.local:8081/repository/maven-public/ -ntp -s $GLOBAL_MVN_SETTINGS -Dmaven.repo.local=.repository -Pci -Peclipse-dash -V -B -e -U $cmdline" + dashProfile = "" + if(useEclipseDash()) { + dashProfile = " -Peclipse-dash " + } + sh "mvn $extraArgs $dashProfile -DsettingsPath=$GLOBAL_MVN_SETTINGS -Dmaven.repo.uri=http://nexus-service.nexus.svc.cluster.local:8081/repository/maven-public/ -ntp -s $GLOBAL_MVN_SETTINGS -Dmaven.repo.local=.repository -Pci -V -B -e -U $cmdline" if(saveHome()) { archiveArtifacts artifacts: ".repository/org/eclipse/jetty/jetty-home/**/jetty-home-*", allowEmptyArchive: true, onlyIfSuccessful: false } @@ -149,7 +153,7 @@ def mavenBuild(jdk, cmdline, mvnName) { def useBuildCache() { def labelNoBuildCache = false if (env.BRANCH_NAME ==~ /PR-\d+/) { - labelNoBuildCache = pullRequest.labels.contains("build-no-cache") + labelNoBuildCache = pullRequest.labels.contains("build-no-cache") || pullRequest.labels.contains("dependencies") } def noBuildCache = (env.BRANCH_NAME == 'jetty-12.0.x') || labelNoBuildCache; return !noBuildCache; @@ -157,6 +161,10 @@ def useBuildCache() { // return false } +def useEclipseDash() { + return pullRequest.labels.contains("eclipse-dash") +} + def saveHome() { if (env.BRANCH_NAME ==~ /PR-\d+/) { return pullRequest.labels.contains("save-home")