X-Git-Url: https://gerrit.linuxfoundation.org/infra/gitweb?a=blobdiff_plain;f=jjb%2Flf-maven-jobs.yaml;h=b2482c12d8fc939d0bdd101621e3b7735b339e03;hb=c3150dcea8069e284ec52bf487541576a62687ab;hp=9f7173abe24d1923d3cd94067382deb172ec250d;hpb=76a760c1a39a38def2b9c5642645abf5abde83f3;p=releng%2Fglobal-jjb.git

diff --git a/jjb/lf-maven-jobs.yaml b/jjb/lf-maven-jobs.yaml
index 9f7173ab..b2482c12 100644
--- a/jjb/lf-maven-jobs.yaml
+++ b/jjb/lf-maven-jobs.yaml
@@ -52,6 +52,15 @@
 # Macros #
 ##########
 
+- builder:
+    name: lf-maven-build
+    builders:
+      - inject:
+          properties-content: 'MAVEN_GOALS={mvn-goals}'
+      - shell: !include-raw-escape:
+          - ../shell/common-variables.sh
+          - ../shell/maven-build.sh
+
 - builder:
     name: lf-maven-deploy
     builders:
@@ -62,7 +71,8 @@
 - builder:
     name: lf-maven-stage
     builders:
-      - shell: !include-raw-escape:
+      # include-raw-escape fails due to JJB bug
+      - shell: !include-raw:
           - ../shell/common-variables.sh
           - ../shell/maven-stage.sh
 
@@ -70,7 +80,11 @@
     name: lf-update-java-alternatives
     builders:
       - inject:
-          properties-content: 'SET_JDK_VERSION={java-version}'
+          # Work around inject plugin overriding our GIT_URL variable incorrectly
+          # https://issues.jenkins-ci.org/browse/JENKINS-49775
+          properties-content: |
+            SET_JDK_VERSION={java-version}
+            GIT_URL="$GIT_URL"
       - shell: !include-raw-escape: ../shell/update-java-alternatives.sh
       - inject:
           properties-file: '/tmp/java.env'
@@ -493,6 +507,7 @@
     git-url: '$GIT_URL/$PROJECT'
     java-version: openjdk8
     mvn-global-settings: global-settings
+    mvn-goals: clean deploy
     mvn-opts: ''
     mvn-params: '-Dmerge'
     mvn-version: mvn33
@@ -533,9 +548,9 @@
               NEXUS_REPO={nexus-snapshot-repo}
       - shell: !include-raw-escape:
           - ../shell/lftools-install.sh
-          - ../shell/common-variables.sh
           - ../shell/maven-fetch-metadata.sh
-          - ../shell/maven-build.sh
+      - lf-maven-build:
+          mvn-goals: '{mvn-goals}'
       - lf-maven-deploy
       - lf-provide-maven-settings-cleanup
 
@@ -625,6 +640,7 @@
     git-url: '$GIT_URL/$PROJECT'
     java-version: openjdk8
     mvn-global-settings: global-settings
+    mvn-goals: clean deploy
     mvn-opts: ''
     mvn-params: ''
     mvn-version: mvn33
@@ -652,9 +668,9 @@
           server-id: '{mvn-staging-id}'
       - shell: !include-raw-escape:
           - ../shell/lftools-install.sh
-          - ../shell/common-variables.sh
           - ../shell/maven-patch-release.sh
-          - ../shell/maven-build.sh
+      - lf-maven-build:
+          mvn-goals: '{mvn-goals}'
       - lf-maven-stage
       - lf-provide-maven-settings-cleanup
 
@@ -891,6 +907,7 @@
     git-url: '$GIT_URL/$PROJECT'
     java-version: openjdk8
     mvn-global-settings: global-settings
+    mvn-goals: clean deploy
     mvn-opts: ''
     mvn-params: '-Dstream=$STREAM'
     mvn-version: mvn33
@@ -927,8 +944,8 @@
           settings-file: '{mvn-settings}'
       - shell: !include-raw-escape:
           - ../shell/lftools-install.sh
-          - ../shell/common-variables.sh
-          - ../shell/maven-build.sh
+      - lf-maven-build:
+          mvn-goals: '{mvn-goals}'
       - lf-provide-maven-settings-cleanup
 
     publishers:
@@ -1014,6 +1031,7 @@
     git-url: '$GIT_URL/$PROJECT'
     java-version: openjdk8
     mvn-global-settings: global-settings
+    mvn-goals: clean deploy
     mvn-opts: ''
     mvn-params: '-Dstream=$STREAM'
     mvn-version: mvn33
@@ -1047,9 +1065,8 @@
       - shell: !include-raw-escape:
           - ../shell/common-variables.sh
           - ../shell/maven-build-deps.sh
-      - shell: !include-raw-escape:
-          - ../shell/common-variables.sh
-          - ../shell/maven-build.sh
+      - lf-maven-build:
+          mvn-goals: '{mvn-goals}'
       - lf-provide-maven-settings-cleanup
 
     publishers: