Fix icn-daaas trigger paths

This also renames the templates file to the blueprint level, and
moves the project file into the correct directory.

Issue: LF-Jira IT-18489
Change-Id: I40f480eebd2a5511fc7442a67b8e49d09ea9ad40
Signed-off-by: Eric Ball <eball@linuxfoundation.org>

diff --git a/jjb/akraino-templates/akraino-icn-daaas-templates.yaml b/jjb/akraino-templates/akraino-icn-templates.yaml
similarity index 95%
rename from jjb/akraino-templates/akraino-icn-daaas-templates.yaml
rename to jjb/akraino-templates/akraino-icn-templates.yaml
index 61de6ca..9b2953c 100644 (file)
--- a/jjb/akraino-templates/akraino-icn-daaas-templates.yaml
+++ b/jjb/akraino-templates/akraino-icn-templates.yaml
@@ -94,8 +94,8 @@
                 - branch-compare-type: "ANT"
                   branch-pattern: "**/{branch}"
               file-paths:
-                - compare-type: ANT
-                  pattern: "**/{path}/*"
+                - compare-type: REG_EXP
+                  pattern: ".*/?{path}/.*"
               disable-strict-forbidden-file-verification: "true"
               forbidden-file-paths:
                 - compare-type: ANT
@@ -124,8 +124,8 @@
                 - branch-compare-type: "ANT"
                   branch-pattern: "**/{branch}"
               file-paths:
-                - compare-type: ANT
-                  pattern: "**/{path}/*"
+                - compare-type: REG_EXP
+                  pattern: ".*/?{path}/.*"
               disable-strict-forbidden-file-verification: "true"
               forbidden-file-paths:
                 - compare-type: ANT

diff --git a/jjb/icn-daaas/icn-daaas.yaml b/jjb/icn/icn-daaas.yaml
similarity index 100%
rename from jjb/icn-daaas/icn-daaas.yaml
rename to jjb/icn/icn-daaas.yaml