Fix branch on verify and merge jobs

[releng/global-jjb.git] / jjb / lf-maven-jobs.yaml

diff --git a/jjb/lf-maven-jobs.yaml b/jjb/lf-maven-jobs.yaml
index 0191c84..27d505d 100644 (file)
--- a/jjb/lf-maven-jobs.yaml
+++ b/jjb/lf-maven-jobs.yaml
@@ -71,6 +71,10 @@
           mvn-version: '{mvn-version}'
           # Staging repos do not make sense for CLM jobs so set it blank.
           staging-profile-id: '{staging-profile-id}'
+      - string:
+          name: ARCHIVE_ARTIFACTS
+          default: '{archive-artifacts}'
+          description: Artifacts to archive to the logs server.
 
     wrappers:
       - lf-infra-wrappers:
@@ -95,6 +99,7 @@
     # Default parameters #
     ######################
 
+    archive-artifacts: ''
     branch: master
     build-days-to-keep: 30  # 30 days for troubleshooting purposes
     build-timeout: 15
@@ -160,8 +165,8 @@
     scm:
       - lf-infra-github-scm:
           url: '{git-clone-url}{github-org}/{project}'
-          refspec: '+refs/pull/*:refs/remotes/origin/pr/*'
-          branch: '{branch}'
+          refspec: ''
+          branch: 'refs/heads/{branch}'
           submodule-recursive: '{submodule-recursive}'
           choosing-strategy: default
           jenkins-ssh-credential: '{jenkins-ssh-credential}'
@@ -177,6 +182,7 @@
     # Default parameters #
     ######################
 
+    archive-artifacts: ''
     branch: master
     build-days-to-keep: 30  # 30 days in case a release takes long to get approved.
     build-timeout: 30
@@ -290,6 +296,7 @@
     # Default parameters #
     ######################
 
+    archive-artifacts: ''
     branch: master
     build-days-to-keep: 30  # 30 days in case a release takes long to get approved.
     build-timeout: 30
@@ -316,6 +323,8 @@
     # Job Configuration #
     #####################
 
+    concurrent: true
+
     builders:
       - lf-maven-install:
           mvn-version: '{mvn-version}'
@@ -369,7 +378,7 @@
       - lf-infra-github-scm:
           url: '{git-clone-url}{github-org}/{project}'
           refspec: '+refs/pull/*:refs/remotes/origin/pr/*'
-          branch: '{branch}'
+          branch: '$sha1'
           submodule-recursive: '{submodule-recursive}'
           choosing-strategy: default
           jenkins-ssh-credential: '{jenkins-ssh-credential}'
@@ -398,6 +407,7 @@
     # Default parameters #
     ######################
 
+    archive-artifacts: ''
     branch: master
     build-days-to-keep: 30  # 30 days in case a release takes long to get approved.
     build-timeout: 30
@@ -509,6 +519,7 @@
     # Default parameters #
     ######################
 
+    archive-artifacts: ''
     branch: master  # Sonar should always be run on master branch
     build-days-to-keep: 7
     build-timeout: 30
@@ -607,7 +618,7 @@
       - lf-infra-github-scm:
           url: '{git-clone-url}{github-org}/{project}'
           refspec: '+refs/pull/*:refs/remotes/origin/pr/*'
-          branch: '{branch}'
+          branch: '$sha1'
           submodule-recursive: '{submodule-recursive}'
           choosing-strategy: default
           jenkins-ssh-credential: '{jenkins-ssh-credential}'
@@ -636,6 +647,7 @@
     # Default parameters #
     ######################
 
+    archive-artifacts: ''
     branch: master
     build-days-to-keep: 7
     build-timeout: 60
@@ -728,7 +740,7 @@
       - lf-infra-github-scm:
           url: '{git-clone-url}{github-org}/{project}'
           refspec: '+refs/pull/*:refs/remotes/origin/pr/*'
-          branch: '{branch}'
+          branch: '$sha1'
           submodule-recursive: '{submodule-recursive}'
           choosing-strategy: default
           jenkins-ssh-credential: '{jenkins-ssh-credential}'
@@ -757,6 +769,7 @@
     # Default parameters #
     ######################
 
+    archive-artifacts: ''
     branch: master
     build-days-to-keep: 7
     build-timeout: 60