X-Git-Url: https://gerrit.linuxfoundation.org/infra/gitweb?a=blobdiff_plain;f=jjb%2Flf-maven-jobs.yaml;h=0d777553e2d1b84ca0ef8f2c941c40ff42f9b915;hb=d371fe9f60056d0f4efd988613636869c515b02d;hp=b2482c12d8fc939d0bdd101621e3b7735b339e03;hpb=034c644943cad95457b9086c922dbdb74fb848e0;p=releng%2Fglobal-jjb.git

diff --git a/jjb/lf-maven-jobs.yaml b/jjb/lf-maven-jobs.yaml
index b2482c12..0d777553 100644
--- a/jjb/lf-maven-jobs.yaml
+++ b/jjb/lf-maven-jobs.yaml
@@ -166,7 +166,7 @@
     mvn-global-settings: global-settings
     mvn-opts: ''
     mvn-params: ''
-    mvn-version: mvn33
+    mvn-version: mvn35
     staging-profile-id: ''  # Unused in this job
     stream: master
     submodule-recursive: true
@@ -179,24 +179,6 @@
     # Job Configuration #
     #####################
 
-    triggers:
-      # Build weekly on Saturdays
-      - timed: 'H H * * 6'
-      - gerrit:
-          server-name: '{gerrit-server-name}'
-          trigger-on: '{obj:gerrit_clm_triggers}'
-          projects:
-            - project-compare-type: ANT
-              project-pattern: '{project}'
-              branches:
-                - branch-compare-type: ANT
-                  branch-pattern: '**/{branch}'
-          skip-vote:
-            successful: true
-            failed: true
-            unstable: true
-            notbuilt: true
-
     builders:
       - lf-maven-install:
           mvn-version: '{mvn-version}'
@@ -229,6 +211,24 @@
           submodule-recursive: '{submodule-recursive}'
           choosing-strategy: default
 
+    triggers:
+      # Build weekly on Saturdays
+      - timed: 'H H * * 6'
+      - gerrit:
+          server-name: '{gerrit-server-name}'
+          trigger-on: '{obj:gerrit_clm_triggers}'
+          projects:
+            - project-compare-type: ANT
+              project-pattern: '{project}'
+              branches:
+                - branch-compare-type: ANT
+                  branch-pattern: '**/{branch}'
+          skip-vote:
+            successful: true
+            failed: true
+            unstable: true
+            notbuilt: true
+
 - job-template:
     name: '{project-name}-maven-clm-{stream}'
     id: github-maven-clm
@@ -237,6 +237,8 @@
     <<: *lf_maven_clm
 
     properties:
+      - lf-infra-properties:
+          build-days-to-keep: '{build-days-to-keep}'
       - github:
           url: '{git-url}/{github-org}/{project}'
 
@@ -250,17 +252,18 @@
           jenkins-ssh-credential: '{jenkins-ssh-credential}'
 
     triggers:
-      - lf-infra-github-pr-trigger:
+      # Build weekly on Saturdays
+      - timed: 'H H * * 6'
+      - github-pull-request:
           trigger-phrase: '^run-clm$'
           only-trigger-phrase: false
           status-context: 'CLM'
           permit-all: true
           github-hooks: true
-          github-org: ''
-          github_pr_whitelist:
-            - ''
-          github_pr_admin_list:
-            - ''
+          org-list:
+            - '{github-org}'
+          white-list: '{obj:github_pr_whitelist}'
+          admin-list: '{obj:github_pr_admin_list}'
 
 #########################
 # Maven Javadoc Publish #
@@ -281,7 +284,7 @@
     mvn-global-settings: global-settings
     mvn-opts: ''
     mvn-params: ''
-    mvn-version: mvn33
+    mvn-version: mvn35
     staging-profile-id: ''  # Unused by the javadoc jobs
     stream: master
     submodule-recursive: true
@@ -351,6 +354,8 @@
     <<: *lf_maven_javadoc_publish
 
     properties:
+      - lf-infra-properties:
+          build-days-to-keep: '{build-days-to-keep}'
       - github:
           url: '{git-url}/{github-org}/{project}'
 
@@ -367,15 +372,16 @@
       - github
       - pollscm:
           cron: ''
-      - lf-infra-github-pr-trigger:
+      - github-pull-request:
           trigger-phrase: '^remerge$'
           only-trigger-phrase: true
-          status-context: 'JJB Merge'
+          status-context: 'Maven Javadoc Publish'
           permit-all: false
           github-hooks: true
-          github-org: '{github-org}'
-          github_pr_whitelist: '{obj:github_pr_whitelist}'
-          github_pr_admin_list: '{obj:github_pr_admin_list}'
+          org-list:
+            - '{github-org}'
+          white-list: '{obj:github_pr_whitelist}'
+          admin-list: '{obj:github_pr_admin_list}'
 
 ########################
 # Maven Javadoc Verify #
@@ -396,7 +402,7 @@
     mvn-global-settings: global-settings
     mvn-opts: ''
     mvn-params: ''
-    mvn-version: mvn33
+    mvn-version: mvn35
     staging-profile-id: ''  # Unused by the javadoc jobs
     stream: master
     submodule-recursive: true
@@ -408,7 +414,7 @@
           exclude-no-code-change: false
       - draft-published-event
       - comment-added-contains-event:
-          comment-contains-value: recheck$
+          comment-contains-value: '^Patch Set[ ]+[0-9]+:([ ]+|[\n]+)(recheck|reverify)$'
 
     #####################
     # Job Configuration #
@@ -464,6 +470,8 @@
     <<: *lf_maven_javadoc_verify
 
     properties:
+      - lf-infra-properties:
+          build-days-to-keep: '{build-days-to-keep}'
       - github:
           url: '{git-url}/{github-org}/{project}'
 
@@ -477,17 +485,12 @@
           jenkins-ssh-credential: '{jenkins-ssh-credential}'
 
     triggers:
-      - lf-infra-github-pr-trigger:
-          trigger-phrase: '^recheck$'
-          only-trigger-phrase: true
-          status-context: 'Maven Javadoc'
+      - github-pull-request:
+          trigger-phrase: ^(recheck|reverify)$
+          only-trigger-phrase: false
+          status-context: 'Maven Javadoc Verify'
           permit-all: true
           github-hooks: true
-          github-org: ''
-          github_pr_whitelist:
-            - ''
-          github_pr_admin_list:
-            - ''
 
 ###############
 # Maven Merge #
@@ -510,7 +513,7 @@
     mvn-goals: clean deploy
     mvn-opts: ''
     mvn-params: '-Dmerge'
-    mvn-version: mvn33
+    mvn-version: mvn35
     nexus-cut-dirs: 6  # Number of dirs in the Nexus path to remove for wget -r.
     staging-profile-id: ''  # Unused by this job.
     stream: master
@@ -522,8 +525,12 @@
           comment-contains-value: remerge$
 
     gerrit_trigger_file_paths:
-      - compare-type: ANT
-        pattern: '**'
+      - compare-type: REG_EXP
+        pattern: '.*'
+
+    # github_included_regions MUST match gerrit_trigger_file_paths
+    github_included_regions:
+      - '.*'
 
     post_build_trigger: ''
 
@@ -597,6 +604,8 @@
     <<: *lf_maven_merge
 
     properties:
+      - lf-infra-properties:
+          build-days-to-keep: '{build-days-to-keep}'
       - github:
           url: '{git-url}/{github-org}/{project}'
 
@@ -610,17 +619,20 @@
           jenkins-ssh-credential: '{jenkins-ssh-credential}'
 
     triggers:
-      - lf-infra-github-pr-trigger:
+      - github
+      - pollscm:
+          cron: ''
+      - github-pull-request:
           trigger-phrase: '^remerge$'
-          only-trigger-phrase: false
+          only-trigger-phrase: true
           status-context: 'Maven Merge'
-          permit-all: true
+          permit-all: false
           github-hooks: true
-          github-org: ''
-          github_pr_whitelist:
-            - ''
-          github_pr_admin_list:
-            - ''
+          org-list:
+            - '{github-org}'
+          white-list: '{obj:github_pr_whitelist}'
+          admin-list: '{obj:github_pr_admin_list}'
+          included-regions: '{obj:github_included_regions}'
 
 #################
 # Maven Release #
@@ -643,7 +655,7 @@
     mvn-goals: clean deploy
     mvn-opts: ''
     mvn-params: ''
-    mvn-version: mvn33
+    mvn-version: mvn35
     stream: master
     submodule-recursive: true
 
@@ -710,6 +722,8 @@
     <<: *lf_maven_release
 
     properties:
+      - lf-infra-properties:
+          build-days-to-keep: '{build-days-to-keep}'
       - github:
           url: '{git-url}/{github-org}/{project}'
 
@@ -724,17 +738,12 @@
 
     triggers:
       - timed: '{obj:cron}'
-      - lf-infra-github-pr-trigger:
+      - github-pull-request:
           trigger-phrase: '^build release$'
           only-trigger-phrase: true
           status-context: 'Maven Release'
           permit-all: true
           github-hooks: true
-          github-org: ''
-          github_pr_whitelist:
-            - ''
-          github_pr_admin_list:
-            - ''
 
 ###############
 # Maven Sonar #
@@ -756,7 +765,7 @@
     mvn-global-settings: global-settings
     mvn-opts: ''
     mvn-params: ''
-    mvn-version: mvn33
+    mvn-version: mvn35
     sonar-mvn-goal: 'sonar:sonar'
     staging-profile-id: ''  # Unused in this job
     stream: master
@@ -865,6 +874,8 @@
     <<: *lf_maven_sonar
 
     properties:
+      - lf-infra-properties:
+          build-days-to-keep: '{build-days-to-keep}'
       - github:
           url: '{git-url}/{github-org}/{project}'
 
@@ -878,17 +889,12 @@
           jenkins-ssh-credential: '{jenkins-ssh-credential}'
 
     triggers:
-      - lf-infra-github-pr-trigger:
-          trigger-phrase: '^recheck$'
+      - github-pull-request:
+          trigger-phrase: '^run-sonar$'
           only-trigger-phrase: false
-          status-context: 'Maven Verify'
+          status-context: 'Maven Sonar'
           permit-all: true
           github-hooks: true
-          github-org: ''
-          github_pr_whitelist:
-            - ''
-          github_pr_admin_list:
-            - ''
 
 ################
 # Maven Verify #
@@ -910,7 +916,7 @@
     mvn-goals: clean deploy
     mvn-opts: ''
     mvn-params: '-Dstream=$STREAM'
-    mvn-version: mvn33
+    mvn-version: mvn35
     staging-profile-id: ''  # Unused in this job
     stream: master
     submodule-recursive: true
@@ -922,10 +928,15 @@
           exclude-no-code-change: false
       - draft-published-event
       - comment-added-contains-event:
-          comment-contains-value: recheck$
+          comment-contains-value: '^Patch Set[ ]+[0-9]+:([ ]+|[\n]+)(recheck|reverify)$'
+
     gerrit_trigger_file_paths:
-      - compare-type: ANT
-        pattern: '**'
+      - compare-type: REG_EXP
+        pattern: '.*'
+
+    # github_included_regions MUST match gerrit_trigger_file_paths
+    github_included_regions:
+      - '.*'
 
     #####################
     # Job Configuration #
@@ -989,6 +1000,8 @@
     <<: *lf_maven_verify
 
     properties:
+      - lf-infra-properties:
+          build-days-to-keep: '{build-days-to-keep}'
       - github:
           url: '{git-url}/{github-org}/{project}'
 
@@ -1002,17 +1015,13 @@
           jenkins-ssh-credential: '{jenkins-ssh-credential}'
 
     triggers:
-      - lf-infra-github-pr-trigger:
-          trigger-phrase: '^recheck$'
+      - github-pull-request:
+          trigger-phrase: '^(recheck|reverify)$'
           only-trigger-phrase: false
           status-context: 'Maven Verify'
           permit-all: true
           github-hooks: true
-          github-org: ''
-          github_pr_whitelist:
-            - ''
-          github_pr_admin_list:
-            - ''
+          included-regions: '{obj:github_included_regions}'
 
 #############################
 # Maven Verify Dependencies #
@@ -1034,7 +1043,7 @@
     mvn-goals: clean deploy
     mvn-opts: ''
     mvn-params: '-Dstream=$STREAM'
-    mvn-version: mvn33
+    mvn-version: mvn35
     staging-profile-id: ''  # Unused by this job
     stream: master
     submodule-recursive: true