X-Git-Url: https://gerrit.nordix.org/gitweb?a=blobdiff_plain;f=jjb%2Fnolabs%2Fnolabs-jobs.yaml;h=d78969a5e2115930a01267daeb341fa8ec9fb5c3;hb=da7ada67ac1e0ea0fda274e36f76cfa991ca8ade;hp=d4edb7442f9b05f3f93f5ccb579463d7b7798cbf;hpb=1fef16ef26769ca8adf0d5e10742addc22789e62;p=infra%2Fcicd.git

diff --git a/jjb/nolabs/nolabs-jobs.yaml b/jjb/nolabs/nolabs-jobs.yaml
index d4edb744..d78969a5 100644
--- a/jjb/nolabs/nolabs-jobs.yaml
+++ b/jjb/nolabs/nolabs-jobs.yaml
@@ -29,7 +29,7 @@
 
     jobs:
       - 'nolabs-verify-{stream}'
-      - 'nolabs-merge-{stream}'
+      - 'nolabs-deploy-{stream}'
 
 - job-template:
     name: 'nolabs-verify-{stream}'
@@ -90,16 +90,19 @@
               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:
           !include-raw-escape: ./verify.sh
 
 - job-template:
-    name: 'nolabs-merge-{stream}'
+    name: 'nolabs-deploy-{stream}'
 
     concurrent: false
 
@@ -139,16 +142,27 @@
           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:
-          !include-raw-escape: ./merge.sh
+          !include-raw-escape: ./deploy.sh
 
 # vim: set ts=2 sw=2 expandtab: