X-Git-Url: https://gerrit.linuxfoundation.org/infra/gitweb?a=blobdiff_plain;ds=sidebyside;f=jjb%2Flf-maven-jobs.yaml;h=e879831172b3a6e1c3d203b7e9b31986404e42d0;hb=606d85064243db0714a408a6794c27b3ae2b13cb;hp=57cec949bfffc23693f737503bd431844d179050;hpb=3e79ea1c1f71e75dc4192d9fd15ef3424c473f77;p=releng%2Fglobal-jjb.git

diff --git a/jjb/lf-maven-jobs.yaml b/jjb/lf-maven-jobs.yaml
index 57cec949..e8798311 100644
--- a/jjb/lf-maven-jobs.yaml
+++ b/jjb/lf-maven-jobs.yaml
@@ -7,7 +7,6 @@
     # This job group contains all the recommended jobs that should be deployed
     # for any project ci.
 
-    # TODO: Add Maven Merge job to this list once it's been fully tested.
     jobs:
       - gerrit-maven-clm
       - gerrit-maven-merge
@@ -21,7 +20,6 @@
     # This job group contains all the recommended jobs that should be deployed
     # for any project ci that is using github.
 
-    # TODO: Add Maven Merge job to this list once it's been fully tested.
     jobs:
       - github-maven-clm
       - github-maven-merge
@@ -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}'
@@ -229,7 +230,6 @@
     # yamllint disable-line rule:key-duplicates
     <<: *lf_maven_clm
 
-    disabled: true
     scm:
       - lf-infra-gerrit-scm:
           jenkins-ssh-credential: '{jenkins-ssh-credential}'
@@ -264,7 +264,6 @@
     # yamllint disable-line rule:key-duplicates
     <<: *lf_maven_clm
 
-    disabled: true
     properties:
       - lf-infra-properties:
           build-days-to-keep: '{build-days-to-keep}'
@@ -310,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
@@ -329,6 +329,8 @@
     # Job Configuration #
     #####################
 
+    disabled: '{disable-job}'
+
     builders:
       - lf-maven-install:
           mvn-version: '{mvn-version}'
@@ -430,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
@@ -454,6 +457,7 @@
     #####################
 
     concurrent: true
+    disabled: '{disable-job}'
 
     builders:
       - lf-maven-install:
@@ -542,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
@@ -573,6 +578,8 @@
     # Job Configuration #
     #####################
 
+    disabled: '{disable-job}'
+
     builders:
       - lf-jacoco-nojava-workaround
       - lf-maven-install:
@@ -687,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
@@ -706,6 +714,8 @@
     # Job Configuration #
     #####################
 
+    disabled: '{disable-job}'
+
     parameters:
       - lf-infra-parameters:
           project: '{project}'
@@ -821,6 +831,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
@@ -840,6 +851,8 @@
     # Job Configuration #
     #####################
 
+    disabled: '{disable-job}'
+
     parameters:
       - lf-infra-parameters:
           project: '{project}'
@@ -971,6 +984,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
@@ -1004,6 +1018,7 @@
     #####################
 
     concurrent: true
+    disabled: '{disable-job}'
 
     builders:
       - lf-jacoco-nojava-workaround
@@ -1100,6 +1115,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
@@ -1123,6 +1139,7 @@
     #####################
 
     concurrent: true
+    disabled: '{disable-job}'
 
     builders:
       - lf-jacoco-nojava-workaround