Merge "Validate only template/platform that is built"

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

diff --git a/jjb/lf-ci-jobs.yaml b/jjb/lf-ci-jobs.yaml
index 8645941..2330d28 100644 (file)
--- a/jjb/lf-ci-jobs.yaml
+++ b/jjb/lf-ci-jobs.yaml
@@ -143,6 +143,10 @@
         pattern: '.*\.groovy'
       - compare-type: REG_EXP
         pattern: '.*\.sh'
+      - compare-type: REG_EXP
+        pattern: '.*\.bat'
+      - compare-type: REG_EXP
+        pattern: '.*\.ps1'
       - compare-type: REG_EXP
         pattern: '.*\.(yaml|yml)'
       - compare-type: REG_EXP
@@ -152,6 +156,8 @@
     github_included_regions:
       - '.*\.groovy'
       - '.*\.sh'
+      - '.*\.bat'
+      - '.*\.ps1'
       - '.*\.(yaml|yml)'
       - '.*\/global-jjb'
 
@@ -370,6 +376,9 @@
     <<: *lf_jenkins_cfg_merge
 
     properties:
+      - lf-infra-properties:
+          project: '{project}'
+          build-days-to-keep: 1
       - github:
           url: '{git-url}/{github-org}/{project}'
 
@@ -489,6 +498,9 @@
     <<: *lf_jjb_deploy_job
 
     properties:
+      - lf-infra-properties:
+          project: '{project}'
+          build-days-to-keep: 1
       - github:
           url: '{git-url}/{github-org}/{project}'
 
@@ -578,6 +590,9 @@
     #####################
 
     properties:
+      - lf-infra-properties:
+          project: '{project}'
+          build-days-to-keep: 7
       - github:
           url: '{git-url}/{github-org}/{project}'
 
@@ -624,7 +639,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 #
@@ -692,6 +707,9 @@
     #####################
 
     properties:
+      - lf-infra-properties:
+          project: '{project}'
+          build-days-to-keep: 7
       - github:
           url: '{git-url}/{github-org}/{project}'
 
@@ -706,7 +724,7 @@
 
     triggers:
       - github-pull-request:
-          trigger-phrase: '^recheck$'
+          trigger-phrase: '^(recheck|reverify)$'
           only-trigger-phrase: false
           status-context: 'JJB Verify'
           permit-all: true
@@ -737,6 +755,7 @@
     lhc-version: 0.2.0
     license-exclude-paths: ''
     licenses-allowed: Apache-2.0,EPL-1.0,MIT
+    project-pattern: '**'
     spdx-disable: false
     stream: master
 
@@ -806,7 +825,7 @@
                 comment-contains-value: recheck$
           projects:
             - project-compare-type: ANT
-              project-pattern: '**'
+              project-pattern: '{project-pattern}'
               branches:
                 - branch-compare-type: ANT
                   branch-pattern: '**'
@@ -817,6 +836,8 @@
     <<: *lf_license_check
 
     properties:
+      - lf-infra-properties:
+          build-days-to-keep: '{build-days-to-keep}'
       - github:
           url: '{git-url}/{github-org}/{project}'
 
@@ -856,7 +877,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 #
@@ -923,7 +944,7 @@
 
     triggers:
       - github-pull-request:
-          trigger-phrase: '^recheck$'
+          trigger-phrase: '^(recheck|reverify)$'
           only-trigger-phrase: false
           status-context: 'INFO File Verify'
           permit-all: true
@@ -943,9 +964,6 @@
     #####################
 
     builders:
-      - lf-infra-packer-validate:
-          packer-cloud-settings: '{packer-cloud-settings}'
-          packer-version: '{packer-version}'
       - lf-infra-packer-build:
           packer-cloud-settings: '{packer-cloud-settings}'
           packer-version: '{packer-version}'
@@ -997,6 +1015,10 @@
               file-paths:
                 - compare-type: REG_EXP
                   pattern: 'packer\/provision\/.*\.sh'
+                - compare-type: REG_EXP
+                  pattern: 'packer\/provision\/.*\.bat'
+                - compare-type: REG_EXP
+                  pattern: 'packer\/provision\/.*\.ps1'
                 - compare-type: REG_EXP
                   pattern: 'packer\/provision\/{templates}\.yaml'
                 - compare-type: REG_EXP
@@ -1018,6 +1040,9 @@
     #####################
 
     properties:
+      - lf-infra-properties:
+          project: '{project}'
+          build-days-to-keep: 7
       - github:
           url: '{git-url}/{github-org}/{project}'
 
@@ -1049,6 +1074,8 @@
           # included-regions MUST match Gerrit Trigger file-paths
           included-regions:
             - 'packer\/provision\/.*\.sh'
+            - 'packer\/provision\/.*\.bat'
+            - 'packer\/provision\/.*\.ps1'
             - 'packer\/provision\/{templates}\.yaml'
             - 'packer\/provision\/local-{templates}\.yaml'
             - 'packer\/templates\/{templates}\.json'
@@ -1074,7 +1101,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)$'
 
     gerrit_trigger_file_paths:
       - compare-type: REG_EXP
@@ -1145,6 +1172,9 @@
     #####################
 
     properties:
+      - lf-infra-properties:
+          project: '{project}'
+          build-days-to-keep: 7
       - github:
           url: '{git-url}/{github-org}/{project}'
 
@@ -1159,7 +1189,7 @@
 
     triggers:
       - github-pull-request:
-          trigger-phrase: '^recheck$'
+          trigger-phrase: '^(recheck|reverify)$'
           only-trigger-phrase: false
           status-context: 'Packer Verify'
           permit-all: true