From: Houa Yang <hyang@contractor.linuxfoundation.org>
Date: Tue, 26 Nov 2019 17:11:22 +0000 (-0600)
Subject: Update lf-release-jobs gerrit trigger
X-Git-Tag: v0.49.0~20^2
X-Git-Url: https://gerrit.linuxfoundation.org/infra/gitweb?a=commitdiff_plain;h=9ce5ef214927e657dbd0d7cf6ed1ad613d642055;p=releng%2Fglobal-jjb.git

Update lf-release-jobs gerrit trigger

Update release jobs regex to match based on file name and not on
releases/*.yaml.

Signed-off-by: Houa Yang <hyang@contractor.linuxfoundation.org>
Change-Id: I736a645a710f32228dc716d00662d5bbc322d4c4
---

diff --git a/docs/jjb/lf-release-jobs.rst b/docs/jjb/lf-release-jobs.rst
index cd0e1b55..8b5fa3d9 100644
--- a/docs/jjb/lf-release-jobs.rst
+++ b/docs/jjb/lf-release-jobs.rst
@@ -49,7 +49,8 @@ For example, the parameters for a Maven release are as follows::
 Maven Release Files
 -------------------
 
-An example of a maven release file appears below.
+An example of a maven release file appears below. Name of release file
+must start with "maven". eg. releases/maven-1.0.0-test.yaml
 
 .. code-block:: none
 
@@ -179,11 +180,12 @@ The JSON schema for a container release file appears below.
 PyPI Release Files
 ------------------
 
-An example of a PyPI release file appears below.
+An example of a PyPI release file appears below. Name of the release file must
+start with "pypi". eg. releases/pypi-1.0.0-mypackage.yaml
 
 .. code-block:: none
 
-    $ cat releases/pypi-release.yaml
+    $ cat releases/pypi-1.0.0-mypackage.yaml
     ---
     distribution_type: pypi
     pypi_project: mypackage
@@ -243,11 +245,12 @@ The JSON schema for a PyPI release file appears below.
 PackageCloud Release Files
 --------------------------
 
-An example of a PackageCloud release file appears below.
+An example of a PackageCloud release file appears below. Name of release file
+must start with "packagecloud". eg. releases/packagecloud-1.6.0-tree.yaml
 
 .. code-block:: none
 
-    $ cat releases/packagecloud-release.yaml
+    $ cat releases/packagecloud-1.6.0-tree.yaml
     ---
     distribution_type: packagecloud
     package_name:
@@ -387,7 +390,7 @@ This template supports Maven and Container release jobs.
         **default**::
 
             - compare-type: REG_EXP
-              pattern: '(releases\/.*\.yaml|\.releases\/.*\.yaml)'
+              pattern: '(releases\/maven.*\.yaml|\.releases\/maven.*\.yaml)'
 
 
 PyPI Release Merge
@@ -428,6 +431,12 @@ template accepts neither a branch nor a stream parameter.
         should be the repository pypy.org. (default: pypi)
     :use-release-file: Whether to use the release file. (default: true)
 
+    :gerrit_trigger_file_paths: Override file paths filter which checks which
+        file modifications will trigger a build.
+        **default**::
+
+            - compare-type: REG_EXP
+              pattern: '(releases\/pypi.*\.yaml|\.releases\/pypi.*\.yaml)'
 
 PyPI Release Verify
 ~~~~~~~~~~~~~~~~~~~
@@ -466,6 +475,12 @@ verify template accepts neither a branch nor a stream parameter.
         should be the repository pypy.org (default: pypi)
     :use-release-file: Whether to use the release file. (default: true)
 
+    :gerrit_trigger_file_paths: Override file paths filter which checks which
+        file modifications will trigger a build.
+        **default**::
+
+            - compare-type: REG_EXP
+              pattern: '(releases\/pypi.*\.yaml|\.releases\/pypi.*\.yaml)'
 
 PackageCloud Release Verify
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -498,7 +513,7 @@ This template supports PackageCloud release jobs.
         **default**::
 
             - compare-type: REG_EXP
-              pattern: '(releases\/.*\.yaml|\.releases\/.*\.yaml)'
+              pattern: '(releases\/packagecloud.*\.yaml|\.releases\/packagecloud.*\.yaml)'
 
 
 PackageCloud Release Merge
@@ -529,7 +544,7 @@ This template supports PackageCloud release jobs.
         **default**::
 
             - compare-type: reg_exp
-              pattern: '(releases\/.*\.yaml|\.releases\/.*\.yaml)'
+              pattern: '(releases\/packagecloud.*\.yaml|\.releases\/packagecloud.*\.yaml)'
 
 
 Setup for LFID, Nexus, Jenkins and Gerrit
diff --git a/jjb/lf-release-jobs.yaml b/jjb/lf-release-jobs.yaml
index a854c9fa..3df511de 100644
--- a/jjb/lf-release-jobs.yaml
+++ b/jjb/lf-release-jobs.yaml
@@ -131,7 +131,7 @@
                   branch-pattern: "**"
               file-paths:
                 - compare-type: REG_EXP
-                  pattern: '(releases\/.*\.yaml|\.releases\/.*\.yaml)'
+                  pattern: '(releases\/maven.*\.yaml|\.releases\/maven.*\.yaml)'
           skip-vote:
             successful: "{gerrit-skip-vote}"
             failed: "{gerrit-skip-vote}"
@@ -240,7 +240,7 @@
                   branch-pattern: "**"
               file-paths:
                 - compare-type: REG_EXP
-                  pattern: '(releases\/.*\.yaml|\.releases\/.*\.yaml)'
+                  pattern: '(releases\/maven.*\.yaml|\.releases\/maven.*\.yaml)'
 
 ################
 # PyPI RELEASE #
@@ -286,13 +286,13 @@
     # define once and use twice; jobs MUST NOT override
     gerrit_release_trigger_file_paths:
       - compare-type: REG_EXP
-        pattern: '(releases\/.*\.yaml|\.releases\/.*\.yaml)'
+        pattern: '(releases\/pypi.*\.yaml|\.releases\/pypi.*\.yaml)'
 
     # yamllint disable-line rule:line-length
     # github_release_included_regions MUST match gerrit_release_trigger_file_paths
     github_release_included_regions:
-      - 'releases\/.*\.yaml'
-      - '.releases\/.*\.yaml'
+      - 'releases\/pypi.*\.yaml'
+      - '.releases\/pypi.*\.yaml'
 
     parameters:
       - lf-infra-parameters:
@@ -574,7 +574,8 @@
                   branch-pattern: "**"
               file-paths:
                 - compare-type: REG_EXP
-                  pattern: '(releases\/.*\.yaml|\.releases\/.*\.yaml)'
+                  pattern: '(releases\/packagecloud.*\.yaml|\.releases\
+                    /packagecloud.*\.yaml)'
           skip-vote:
             successful: "{gerrit-skip-vote}"
             failed: "{gerrit-skip-vote}"
@@ -665,4 +666,5 @@
                   branch-pattern: "**"
               file-paths:
                 - compare-type: REG_EXP
-                  pattern: '(releases\/.*\.yaml|\.releases\/.*\.yaml)'
+                  pattern: '(releases\/packagecloud.*\.yaml|\.releases\
+                    /packagecloud.*\.yaml)'