From: Lott, Christopher (cl778h) <cl778h@att.com>
Date: Sat, 4 May 2019 10:59:42 +0000 (-0400)
Subject: Add missing file path triggers to maven stage jobs
X-Git-Tag: v0.38.0~16
X-Git-Url: https://gerrit.linuxfoundation.org/infra/gitweb?a=commitdiff_plain;h=73ee59e070520755f0d79a45481baaeada49f29b;p=releng%2Fglobal-jjb.git

Add missing file path triggers to maven stage jobs

Add missing config for triggering on file paths to maven stage macros and
templates, namely gerrit_trigger_file_paths and github_included_regions,
to match the behavior of the maven verify/merge macros and templates.

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

diff --git a/docs/jjb/lf-maven-jobs.rst b/docs/jjb/lf-maven-jobs.rst
index 48a688ee..2a3d0c82 100644
--- a/docs/jjb/lf-maven-jobs.rst
+++ b/docs/jjb/lf-maven-jobs.rst
@@ -393,6 +393,8 @@ directory is then used later to deploy to Nexus.
         (default: false)
 
     :gerrit_release_triggers: Override Gerrit Triggers.
+    :gerrit_trigger_file_paths: Override file paths which can be used to
+        filter which file modifications will trigger a build.
 
 Maven Stage for Docker
 ----------------------
diff --git a/jjb/lf-maven-jobs.yaml b/jjb/lf-maven-jobs.yaml
index 349ad64e..98bc7143 100644
--- a/jjb/lf-maven-jobs.yaml
+++ b/jjb/lf-maven-jobs.yaml
@@ -834,6 +834,14 @@
       - comment-added-contains-event:
           comment-contains-value: stage-release$
 
+    gerrit_trigger_file_paths:
+      - compare-type: ANT
+        pattern: '**'
+
+    # github_included_regions MUST match gerrit_trigger_file_paths
+    github_included_regions:
+      - '.*'
+
     #####################
     # Job Configuration #
     #####################
@@ -925,6 +933,7 @@
               branches:
                 - branch-compare-type: ANT
                   branch-pattern: '**/{branch}'
+              file-paths: '{obj:gerrit_trigger_file_paths}'
 
 - job-template:
     name: '{project-name}-maven-stage-{stream}'
@@ -960,6 +969,7 @@
           github-hooks: true
           white-list-target-branches:
             - '{branch}'
+          included-regions: '{obj:github_included_regions}'
 
 ##########################
 # Maven Stage for Docker #
@@ -1033,6 +1043,7 @@
               branches:
                 - branch-compare-type: ANT
                   branch-pattern: '**/{branch}'
+              file-paths: '{obj:gerrit_trigger_file_paths}'
 
 - job-template:
     name: '{project-name}-maven-docker-stage-{stream}'
@@ -1070,6 +1081,7 @@
           github-hooks: true
           white-list-target-branches:
             - '{branch}'
+          included-regions: '{obj:github_included_regions}'
 
 ###############
 # Maven Sonar #
diff --git a/releasenotes/notes/add-missing-trigger-file-paths-regions-stage-jobs-053a12a759a516b9.yaml b/releasenotes/notes/add-missing-trigger-file-paths-regions-stage-jobs-053a12a759a516b9.yaml
new file mode 100644
index 00000000..b832265b
--- /dev/null
+++ b/releasenotes/notes/add-missing-trigger-file-paths-regions-stage-jobs-053a12a759a516b9.yaml
@@ -0,0 +1,6 @@
+---
+fixes:
+  - |
+    Add missing config for triggering on file paths to maven stage macros and templates,
+    namely gerrit_trigger_file_paths nad github_included_regions, to make those
+    macros and templates match the behavior of maven verify and maven merge.