From: Lott, Christopher (cl778h) <cl778h@att.com>
Date: Sat, 1 Jun 2019 11:25:27 +0000 (-0400)
Subject: Add missing file-based triggers to docker templates
X-Git-Tag: v0.38.2^0
X-Git-Url: https://gerrit.linuxfoundation.org/infra/gitweb?a=commitdiff_plain;h=d88144f9f1d5a04989726ab5755c40db5cbc0803;p=releng%2Fglobal-jjb.git

Add missing file-based triggers to docker templates

Includes gerrit_trigger_file_paths and github_included_regions.
In documention: add github_included_regions parameter and
correct gerrit_verify_triggers to gerrit_merge_triggers.

Change-Id: If1dd342d9fe8591028cd1fabcb7c830e41df2fe5
Signed-off-by: Lott, Christopher (cl778h) <cl778h@att.com>
---

diff --git a/docs/jjb/lf-docker-jobs.rst b/docs/jjb/lf-docker-jobs.rst
index 05a0e3cd..fd231958 100644
--- a/docs/jjb/lf-docker-jobs.rst
+++ b/docs/jjb/lf-docker-jobs.rst
@@ -80,8 +80,12 @@ Executes a docker build task.
         (default: 10)
 
     :gerrit_verify_triggers: Override Gerrit Triggers.
-    :gerrit_trigger_file_paths: Override file paths which can be used to
-        filter which file modifications will trigger a build.
+    :gerrit_trigger_file_paths: Override Gerrit file paths which can be
+        used to filter which file modifications will trigger a build.
+    :github_included_regions: Override Github file paths which can be
+        used to filter which file modifications will trigger a build;
+        must match parameter gerrit_trigger_file_paths
+
 
 container-tag.yaml example:
 
@@ -135,9 +139,12 @@ Executes a docker build task and publishes the resulting images to a specified D
     :submodule-timeout: Timeout (in minutes) for checkout operation.
         (default: 10)
 
-    :gerrit_verify_triggers: Override Gerrit Triggers.
-    :gerrit_trigger_file_paths: Override file paths which can be used to
-        filter which file modifications will trigger a build.
+    :gerrit_merge_triggers: Override Gerrit Triggers.
+    :gerrit_trigger_file_paths: Override Gerrit file paths which can be
+        used to filter which file modifications will trigger a build.
+    :github_included_regions: Override Github file paths which can be
+        used to filter which file modifications will trigger a build;
+        must match parameter gerrit_trigger_file_paths
 
 container-tag.yaml example:
 
diff --git a/jjb/lf-docker-jobs.yaml b/jjb/lf-docker-jobs.yaml
index 9b8b7314..ec870b6d 100644
--- a/jjb/lf-docker-jobs.yaml
+++ b/jjb/lf-docker-jobs.yaml
@@ -130,6 +130,14 @@
       - comment-added-contains-event:
           comment-contains-value: '^Patch Set[ ]+[0-9]+:([ ]+|[\n]+)(recheck|reverify)$'
 
+    gerrit_trigger_file_paths:
+      - compare-type: REG_EXP
+        pattern: '.*'
+
+    # github_included_regions MUST match gerrit_trigger_file_paths
+    github_included_regions:
+      - '.*'
+
     builders:
       - lf-infra-pre-build
       - lf-infra-docker-login:
@@ -167,6 +175,14 @@
       - comment-added-contains-event:
           comment-contains-value: remerge$
 
+    gerrit_trigger_file_paths:
+      - compare-type: REG_EXP
+        pattern: '.*'
+
+    # github_included_regions MUST match gerrit_trigger_file_paths
+    github_included_regions:
+      - '.*'
+
     builders:
       - lf-infra-pre-build
       - lf-infra-docker-login:
@@ -214,6 +230,7 @@
               branches:
                 - branch-compare-type: ANT
                   branch-pattern: '**/{branch}'
+              file-paths: '{obj:gerrit_trigger_file_paths}'
 
 - job-template:
     name: '{project-name}-docker-verify-{stream}'
@@ -281,6 +298,7 @@
               branches:
                 - branch-compare-type: ANT
                   branch-pattern: '**/{branch}'
+              file-paths: '{obj:gerrit_trigger_file_paths}'
 
 - job-template:
     name: '{project-name}-docker-merge-{stream}'
diff --git a/releasenotes/notes/add-missing-trigger-file-paths-regions-docker-jobs-164b23b860b627c0.yaml b/releasenotes/notes/add-missing-trigger-file-paths-regions-docker-jobs-164b23b860b627c0.yaml
new file mode 100644
index 00000000..e6685aa6
--- /dev/null
+++ b/releasenotes/notes/add-missing-trigger-file-paths-regions-docker-jobs-164b23b860b627c0.yaml
@@ -0,0 +1,6 @@
+---
+fixes:
+  - |
+    Add missing config for triggering on file paths to docker macros and templates,
+    namely gerrit_trigger_file_paths and github_included_regions, to make the verify
+    and merge macros and templates match the behavior of other jobs.