Allow for multiple forbidden paths

Change-Id: Icbd12007189359b08062afd2a2a5fc870edce645
Signed-off-by: Luis Gomez <ecelgp@gmail.com>

diff --git a/jjb/integration/distribution/distribution-jobs.yaml b/jjb/integration/distribution/distribution-jobs.yaml
index 2e7b6b22c441733db0d7ca69cae61b2d55c4792a..2e860e510df846a76e4ce978ae8f516c256ca801 100644 (file)
--- a/jjb/integration/distribution/distribution-jobs.yaml
+++ b/jjb/integration/distribution/distribution-jobs.yaml
@@ -51,7 +51,7 @@
     email-upstream: "[int/dist]"
     type: managed
     profile: "-Pmanaged"
-    forbidden-files: "opendaylight/**"
+    forbidden-files: '(opendaylight\/.*|docker\/.*)'
     java-version: "openjdk11"
     jre: "openjdk11"
     karaf-version: karaf4

diff --git a/jjb/releng-macros.yaml b/jjb/releng-macros.yaml
index 4e9c74a4899ee8cfc3ccaf42d1772922cdadea4f..48355d67b115a93a842af12b4553be0ae2f4bf2a 100644 (file)
--- a/jjb/releng-macros.yaml
+++ b/jjb/releng-macros.yaml
@@ -146,7 +146,7 @@
                 - compare-type: ANT
                   pattern: "{files}"
               forbidden-file-paths:
-                - compare-type: ANT
+                - compare-type: REG_EXP
                   pattern: "{forbidden-files}"
 
 # TODO: Unify argument names across gerrit-trigger-* macros.
@@ -169,7 +169,7 @@
                 - compare-type: ANT
                   pattern: "{files}"
               forbidden-file-paths:
-                - compare-type: ANT
+                - compare-type: REG_EXP
                   pattern: "{forbidden-files}"
           skip-vote:
             successful: true