From 6f02dc4002fae02f3e991084a1c8090b856fb18d Mon Sep 17 00:00:00 2001
From: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
Date: Mon, 18 Sep 2017 23:13:25 +0200
Subject: securedlab: Use Pharos git sub for PDF validation

- drop obsolete file pattern matching.
- drop duplicate check-jinja2.sh from releng, use securedlab script;

While at it, s/danube/euphrates/ to enable stable/E verify.

Depends-on: I9d6807f3d24cee8d9a03955112a8c179d9ea7d14

Change-Id: Ia88140d872f2b64ff013f22ef0f43bd2cb31bd4f
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
---
 jjb/securedlab/check-jinja2.sh  |  9 ---------
 jjb/securedlab/check-jinja2.yml | 14 ++++++--------
 2 files changed, 6 insertions(+), 17 deletions(-)
 delete mode 100755 jjb/securedlab/check-jinja2.sh

(limited to 'jjb')

diff --git a/jjb/securedlab/check-jinja2.sh b/jjb/securedlab/check-jinja2.sh
deleted file mode 100755
index 4c1927d77..000000000
--- a/jjb/securedlab/check-jinja2.sh
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/bin/bash
-set +x
-set -o errexit
-for lab_configs in $(find labs/ -name 'pod*.yaml'); do
-        while IFS= read -r jinja_templates; do
-          echo "./utils/generate_config.py -y $lab_configs -j $jinja_templates"
-          ./utils/generate_config.py -y $lab_configs -j $jinja_templates
-        done < <(find installers/ -name '*.j2')
-done
diff --git a/jjb/securedlab/check-jinja2.yml b/jjb/securedlab/check-jinja2.yml
index 430ced560..36d5e3a4e 100644
--- a/jjb/securedlab/check-jinja2.yml
+++ b/jjb/securedlab/check-jinja2.yml
@@ -1,5 +1,5 @@
 ########################
-# Job configuration to validate jninja2 files
+# Job configuration to validate jinja2 files
 ########################
 - project:
 
@@ -14,7 +14,7 @@
         - master:
             branch: '{stream}'
             disabled: false
-        - danube:
+        - euphrates:
             branch: 'stable/{stream}'
             disabled: false
 
@@ -64,12 +64,10 @@
                   - branch-compare-type: 'ANT'
                     branch-pattern: '**/{branch}'
                 file-paths:
-                  - compare-type: ANT
-                    pattern: 'utils/generate_config.yml'
-                  - compare-type: ANT
-                    pattern: '**/*.jinja2'
                   - compare-type: ANT
                     pattern: '**/*.yaml'
+                  - compare-type: ANT
+                    pattern: 'check-jinja2.sh'
             skip-vote:
                 successful: true
                 failed: true
@@ -82,5 +80,5 @@
 - builder:
     name: check-jinja
     builders:
-        - shell:
-            !include-raw-escape: ./check-jinja2.sh
+        - shell: |
+            $WORKSPACE/check-jinja2.sh
-- 
cgit