X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fsecuredlab%2Fcheck-jinja2.yml;h=f7a7941dc7de29408155438c4e614a67f72607f2;hb=fea07336516a44b3216f8c95e231a6acf8c099e0;hp=578e7869f423b5a3ecaeae81aef06f07a212d349;hpb=93747f1709a4641db4eae87c072e5825349b768a;p=releng.git

diff --git a/jjb/securedlab/check-jinja2.yml b/jjb/securedlab/check-jinja2.yml
index 578e7869f..f7a7941dc 100644
--- a/jjb/securedlab/check-jinja2.yml
+++ b/jjb/securedlab/check-jinja2.yml
@@ -1,22 +1,23 @@
+---
 ########################
-# Job configuration to validate jninja2 files
+# Job configuration to validate jinja2 files
 ########################
 - project:
 
     name: validate-templates
 
-    project: securedlab
+    project: 'securedlab'
 
     jobs:
-        - 'validate-jinja2-templates-{stream}'
+      - 'validate-jinja2-templates-{stream}'
 
     stream:
-        - master:
-            branch: '{stream}'
-            disabled: false
-        - danube:
-            branch: 'stable/{stream}'
-            disabled: false
+      - master:
+          branch: '{stream}'
+          disabled: false
+      - fraser:
+          branch: 'stable/{stream}'
+          disabled: false
 
 ########################
 # job templates
@@ -27,50 +28,58 @@
 
     disabled: '{obj:disabled}'
 
+    concurrent: true
+
     parameters:
-        - project-parameter:
-            project: $GERRIT_PROJECT
-            branch: '{branch}'
-        - node:
-            name: SLAVE_NAME
-            description: Slave to execute jnija template test
-            default-slaves:
-                - lf-build1
-            allowed-multiselect: true
-            ignore-offline-nodes: true
+      - project-parameter:
+          project: $GERRIT_PROJECT
+          branch: '{branch}'
+      - node:
+          name: SLAVE_NAME
+          description: Slave to execute jnija template test
+          default-slaves:
+            - lf-build1
+          allowed-multiselect: true
+          ignore-offline-nodes: true
 
     scm:
-        - git-scm-gerrit
+      - git-scm-gerrit
 
     triggers:
-        - gerrit:
-            server-name: 'gerrit.opnfv.org'
-            trigger-on:
-                - patchset-created-event:
-                    exclude-drafts: 'false'
-                    exclude-trivial-rebase: 'false'
-                    exclude-no-code-change: 'false'
-                - draft-published-event
-                - comment-added-contains-event:
-                    comment-contains-value: 'recheck'
-                - comment-added-contains-event:
-                    comment-contains-value: 'reverify'
-            projects:
-              - project-compare-type: 'REG_EXP'
-                project-pattern: '{project}'
-                branches:
-                  - branch-compare-type: 'ANT'
-                    branch-pattern: '**/{branch}'
-                file-paths:
-                  - compare-type: ANT
-                    pattern: 'utils/generate_config.yml'
-                  - compare-type: ANT
-                    pattern: '**/*.jinja2'
+      - gerrit:
+          server-name: 'gerrit.opnfv.org'
+          trigger-on:
+            - patchset-created-event:
+                exclude-drafts: 'false'
+                exclude-trivial-rebase: 'false'
+                exclude-no-code-change: 'false'
+            - draft-published-event
+            - comment-added-contains-event:
+                comment-contains-value: 'recheck'
+            - comment-added-contains-event:
+                comment-contains-value: 'reverify'
+          projects:
+            - project-compare-type: 'REG_EXP'
+              project-pattern: '{project}'
+              branches:
+                - branch-compare-type: 'ANT'
+                  branch-pattern: '**/{branch}'
+              file-paths:
+                - compare-type: ANT
+                  pattern: '**/*.yaml'
+                - compare-type: ANT
+                  pattern: 'check-jinja2.sh'
+          skip-vote:
+            successful: true
+            failed: true
+            unstable: true
+            notbuilt: true
+
+    builders:
+      - check-jinja
 
 - builder:
-    name: validate-jnija-templates
+    name: check-jinja
     builders:
-        -shell: |
-           set -o errexit
-           ./utils/generate_config.py -y labs/intel/pod5/pod.yaml -j
-           installers/joid/labconfig.jinja2
+      - shell: |
+          $WORKSPACE/check-jinja2.sh