Update paths for nolabs verify and merge jobs

Change-Id: Iaffdcfc9ad3183a192effaa941f6bfe71a233cb6

diff --git a/jjb/nolabs/nolabs-jobs.yaml b/jjb/nolabs/nolabs-jobs.yaml
index d4edb7442f9b05f3f93f5ccb579463d7b7798cbf..47937b9d5346174b3a7d251ca12c85ef9e29fa2a 100644 (file)
--- a/jjb/nolabs/nolabs-jobs.yaml
+++ b/jjb/nolabs/nolabs-jobs.yaml
@@ -90,9 +90,12 @@
               branches:
                 - branch-compare-type: 'ANT'
                   branch-pattern: '**/{branch}'
-              file-paths:
-                - compare-type: 'ANT'
-                  pattern: '**'
+              disable-strict-forbidden-file-verification: 'false'
+              forbidden-file-paths:
+                - compare-type: ANT
+                  pattern: '.gitignore'
+                - compare-type: ANT
+                  pattern: '.gitreview'
 
     builders:
       - shell:
@@ -139,13 +142,24 @@
           clean_before: false
 
     triggers:
-      - nordix-gerrit-trigger-change-merged:
-          project: '{project}'
-          branch: '{branch}'
-          files: 'jjb/**'
-
-    wrappers:
-      - nordixinfra-jjb-creds-wrapper
+      - gerrit:
+          server-name: 'Nordix Gerrit'
+          trigger-on:
+            - change-merged-event
+            - comment-added-contains-event:
+                comment-contains-value: 'remerge'
+          projects:
+            - project-compare-type: 'ANT'
+              project-pattern: '{project}'
+              branches:
+                - branch-compare-type: 'ANT'
+                  branch-pattern: '**/{branch}'
+              disable-strict-forbidden-file-verification: 'false'
+              forbidden-file-paths:
+                - compare-type: ANT
+                  pattern: '.gitignore'
+                - compare-type: ANT
+                  pattern: '.gitreview'
 
     builders:
       - shell: