Fix branch on verify and merge jobs

[releng/global-jjb.git] / jjb / lf-macros.yaml

diff --git a/jjb/lf-macros.yaml b/jjb/lf-macros.yaml
index 562168a..1167ca4 100644 (file)
--- a/jjb/lf-macros.yaml
+++ b/jjb/lf-macros.yaml
@@ -184,6 +184,12 @@
 - parameter:
     name: lf-infra-maven-parameters
     parameters:
+      - string:
+          name: M2_HOME
+          # Sets an env var for shell scripts to be able to call the dynamically
+          # installed maven without having to calculate the M2_HOME themselves.
+          default: '/w/tools/hudson.tasks.Maven_MavenInstallation/{mvn-version}'
+          description: 'Maven selector to be used by shell scripts'
       - string:
           name: MAVEN_OPTS
           default: '{mvn-opts}'
@@ -385,6 +391,8 @@
           credentials-id: '{jenkins-ssh-credential}'
           url: '{url}'
           refspec: '{refspec}'
+          branches:
+            - '{branch}'
           skip-tag: true
           wipe-workspace: true
           submodule:
@@ -429,3 +437,7 @@
             - '{jenkins-ssh-credential}'
       - openstack:
           single-use: true
+      - config-file-provider:
+          files:
+            - file-id: npmrc
+              target: '$HOME/.npmrc'