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

diff --git a/jjb/nolabs/nolabs-jobs.yaml b/jjb/nolabs/nolabs-jobs.yaml
index ec923285..d78969a5 100644
--- a/jjb/nolabs/nolabs-jobs.yaml
+++ b/jjb/nolabs/nolabs-jobs.yaml
@@ -29,6 +29,7 @@
 
     jobs:
       - 'nolabs-verify-{stream}'
+      - 'nolabs-deploy-{stream}'
 
 - job-template:
     name: 'nolabs-verify-{stream}'
@@ -89,12 +90,79 @@
               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-build.sh
+          !include-raw-escape: ./verify.sh
+
+- job-template:
+    name: 'nolabs-deploy-{stream}'
+
+    concurrent: false
+
+    parameters:
+      - project-parameters:
+          project: '{project}'
+          branch: '{branch}'
+      - nordix-gerrit-parameters
+      - label:
+          name: SLAVE_LABEL
+          default: 'nolabs'
+          description: 'Slave label to schedule this job on.'
+
+    properties:
+      - logrotate
+      - build-blocker:
+          use-build-blocker: true
+          blocking-jobs:
+            - 'nolabs-.*'
+          block-level: 'NODE'
+      - throttle:
+          max-per-node: 1
+          max-total: 1
+          option: project
+
+    wrappers:
+      - build-timeout:
+          timeout: 10
+      - fix-workspace-permissions
+
+    scm:
+      - git-scm:
+          ssh-credentials-id: nordixinfra-nordix-gerrit-ssh
+          branch: '{branch}'
+          refspec: ''
+          wipe_workspace: true
+          clean_before: false
+
+    triggers:
+      - 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: ./deploy.sh
 
 # vim: set ts=2 sw=2 expandtab: