X-Git-Url: https://gerrit.linuxfoundation.org/infra/gitweb?a=blobdiff_plain;f=jjb%2Flf-maven-jobs.yaml;h=c89ba5b1f925523c43fcd09487e9ac1046b8a83e;hb=f4e0e413849367f8f71bc4cb9098e282c0ac206e;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..c89ba5b1 100644
--- a/jjb/lf-maven-jobs.yaml
+++ b/jjb/lf-maven-jobs.yaml
@@ -1,53 +1,6 @@
 ---
 # This file contains job templates for Maven projects.
 
-- job-group:
-    name: '{project-name}-maven-jobs'
-
-    # 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
-      - gerrit-maven-stage
-      - gerrit-maven-verify
-      - gerrit-maven-verify-dependencies
-
-- job-group:
-    name: '{project-name}-github-maven-jobs'
-
-    # 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
-      - github-maven-stage
-      - github-maven-verify
-
-- job-group:
-    name: '{project-name}-maven-javadoc-jobs'
-
-    # This job group contains all the recommended jobs that should be deployed
-    # for any project ci.
-
-    jobs:
-      - gerrit-maven-javadoc-publish
-      - gerrit-maven-javadoc-verify
-
-- job-group:
-    name: '{project-name}-github-maven-javadoc-jobs'
-
-    # This job group contains all the recommended jobs that should be deployed
-    # for any project ci.
-
-    jobs:
-      - github-maven-javadoc-publish
-      - github-maven-javadoc-verify
-
 ##########
 # Macros #
 ##########
@@ -159,6 +112,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 +156,8 @@
     # Job Configuration #
     #####################
 
+    disabled: '{disable-job}'
+
     builders:
       - lf-maven-install:
           mvn-version: '{mvn-version}'
@@ -308,6 +264,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 +284,8 @@
     # Job Configuration #
     #####################
 
+    disabled: '{disable-job}'
+
     builders:
       - lf-maven-install:
           mvn-version: '{mvn-version}'
@@ -405,7 +364,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 +387,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 +412,7 @@
     #####################
 
     concurrent: true
+    disabled: '{disable-job}'
 
     builders:
       - lf-maven-install:
@@ -540,6 +501,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 +533,8 @@
     # Job Configuration #
     #####################
 
+    disabled: '{disable-job}'
+
     builders:
       - lf-jacoco-nojava-workaround
       - lf-maven-install:
@@ -660,7 +624,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 +649,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 +669,8 @@
     # Job Configuration #
     #####################
 
+    disabled: '{disable-job}'
+
     parameters:
       - lf-infra-parameters:
           project: '{project}'
@@ -819,6 +786,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 +806,8 @@
     # Job Configuration #
     #####################
 
+    disabled: '{disable-job}'
+
     parameters:
       - lf-infra-parameters:
           project: '{project}'
@@ -969,6 +939,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 +973,7 @@
     #####################
 
     concurrent: true
+    disabled: '{disable-job}'
 
     builders:
       - lf-jacoco-nojava-workaround
@@ -1098,6 +1070,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 +1094,7 @@
     #####################
 
     concurrent: true
+    disabled: '{disable-job}'
 
     builders:
       - lf-jacoco-nojava-workaround