X-Git-Url: https://gerrit.linuxfoundation.org/infra/gitweb?a=blobdiff_plain;f=jjb%2Flf-maven-jobs.yaml;h=81c5fd250441cc376c9b5e4e83a8d29723d266c2;hb=ac3415e0339d82b1695d0d61534209f46b90375e;hp=61fc2b9344d530dcb1bf11c2d701e213c16ef2c6;hpb=7a33fafd1fd236d42db902dbe5c6941484ab6cbf;p=releng%2Fglobal-jjb.git

diff --git a/jjb/lf-maven-jobs.yaml b/jjb/lf-maven-jobs.yaml
index 61fc2b93..81c5fd25 100644
--- a/jjb/lf-maven-jobs.yaml
+++ b/jjb/lf-maven-jobs.yaml
@@ -72,9 +72,7 @@
     name: lf-maven-stage
     builders:
       # include-raw-escape fails due to JJB bug
-      - shell: !include-raw:
-          - ../shell/common-variables.sh
-          - ../shell/maven-stage.sh
+      - shell: !include-raw: ../shell/maven-stage.sh
 
 - builder:
     name: lf-update-java-alternatives
@@ -159,6 +157,7 @@
     branch: master
     build-days-to-keep: 30  # 30 days for troubleshooting purposes
     build-timeout: 60
+    disable-job: false
     git-url: '$GIT_URL/$PROJECT'
     github-url: 'https://github.com'
     java-version: openjdk8
@@ -202,6 +201,8 @@
     # Job Configuration #
     #####################
 
+    disabled: '{disable-job}'
+
     builders:
       - lf-maven-install:
           mvn-version: '{mvn-version}'
@@ -308,6 +309,7 @@
     branch: master
     build-days-to-keep: 30  # 30 days in case a release takes long to get approved.
     build-timeout: 60
+    disable-job: false
     git-url: '$GIT_URL/$PROJECT'
     github-url: 'https://github.com'
     java-version: openjdk8
@@ -327,6 +329,8 @@
     # Job Configuration #
     #####################
 
+    disabled: '{disable-job}'
+
     builders:
       - lf-maven-install:
           mvn-version: '{mvn-version}'
@@ -405,7 +409,7 @@
           trigger-phrase: '^remerge$'
           only-trigger-phrase: true
           status-context: 'Maven Javadoc Publish'
-          permit-all: false
+          permit-all: true
           github-hooks: true
           org-list:
             - '{github-org}'
@@ -428,6 +432,7 @@
     branch: master
     build-days-to-keep: 30  # 30 days in case a release takes long to get approved.
     build-timeout: 60
+    disable-job: false
     git-url: '$GIT_URL/$PROJECT'
     github-url: 'https://github.com'
     java-version: openjdk8
@@ -452,6 +457,7 @@
     #####################
 
     concurrent: true
+    disabled: '{disable-job}'
 
     builders:
       - lf-maven-install:
@@ -540,6 +546,7 @@
     build-days-to-keep: 30  # 30 days in case we need to troubleshoot
     build-timeout: 60
     cron: '@daily'
+    disable-job: false
     git-url: '$GIT_URL/$PROJECT'
     github-url: 'https://github.com'
     java-version: openjdk8
@@ -571,6 +578,8 @@
     # Job Configuration #
     #####################
 
+    disabled: '{disable-job}'
+
     builders:
       - lf-jacoco-nojava-workaround
       - lf-maven-install:
@@ -660,7 +669,7 @@
           trigger-phrase: '^remerge$'
           only-trigger-phrase: true
           status-context: 'Maven Merge'
-          permit-all: false
+          permit-all: true
           github-hooks: true
           org-list:
             - '{github-org}'
@@ -685,6 +694,7 @@
     build-days-to-keep: 30  # 30 days in case a release takes long to get approved.
     build-timeout: 60
     cron: '@daily'
+    disable-job: false
     git-url: '$GIT_URL/$PROJECT'
     github-url: 'https://github.com'
     java-version: openjdk8
@@ -704,6 +714,8 @@
     # Job Configuration #
     #####################
 
+    disabled: '{disable-job}'
+
     parameters:
       - lf-infra-parameters:
           project: '{project}'
@@ -725,6 +737,7 @@
           description: Nexus staging profile ID.
 
     builders:
+      - lf-infra-pre-build
       - lf-jacoco-nojava-workaround
       - lf-maven-install:
           mvn-version: '{mvn-version}'
@@ -735,9 +748,7 @@
           settings-file: '{mvn-settings}'
       - lf-infra-create-netrc:
           server-id: '{mvn-staging-id}'
-      - shell: !include-raw-escape:
-          - ../shell/lftools-install.sh
-          - ../shell/maven-patch-release.sh
+      - shell: !include-raw-escape: ../shell/maven-patch-release.sh
       - lf-maven-build:
           mvn-goals: '{mvn-goals}'
       - lf-maven-stage
@@ -819,6 +830,7 @@
     build-days-to-keep: 7
     build-timeout: 60
     cron: 'H H * * 6'  # run weekly
+    disable-job: false
     git-url: '$GIT_URL/$PROJECT'
     github-url: 'https://github.com'
     java-version: openjdk8
@@ -838,6 +850,8 @@
     # Job Configuration #
     #####################
 
+    disabled: '{disable-job}'
+
     parameters:
       - lf-infra-parameters:
           project: '{project}'
@@ -969,6 +983,7 @@
     branch: master
     build-days-to-keep: 7
     build-timeout: 60
+    disable-job: false
     git-url: '$GIT_URL/$PROJECT'
     github-url: 'https://github.com'
     java-version: openjdk8
@@ -1002,6 +1017,7 @@
     #####################
 
     concurrent: true
+    disabled: '{disable-job}'
 
     builders:
       - lf-jacoco-nojava-workaround
@@ -1098,6 +1114,7 @@
     branch: master
     build-days-to-keep: 7
     build-timeout: 60
+    disable-job: false
     git-url: '$GIT_URL/$PROJECT'
     github-url: 'https://github.com'
     java-version: openjdk8
@@ -1121,6 +1138,7 @@
     #####################
 
     concurrent: true
+    disabled: '{disable-job}'
 
     builders:
       - lf-jacoco-nojava-workaround