disable eclipse dash for now (#12373)

jetty · Oct 11, 2024 · 8689713 · 8689713
1 parent f2c70fb
commit 8689713
Showing 1 changed file with 10 additions and 2 deletions.
diff --git 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,14 +153,18 @@ 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;
   // want to skip build cache
   // return false
 }
 
+def useEclipseDash() {
+  return pullRequest.labels.contains("eclipse-dash")
+}
+
 def saveHome() {
   if (env.BRANCH_NAME ==~ /PR-\d+/) {
     return pullRequest.labels.contains("save-home")