diff options
| author |   Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2017-09-18 23:13:25 +0200 |
|---|---|---|
| committer | Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2017-09-20 18:43:14 +0200 |
| commit | 6f02dc4002fae02f3e991084a1c8090b856fb18d (patch) | |
| tree | fa6a8417fe8c2de3c8de8a2e7a24d61b619c4671 | |
| parent | 8b40327653cfc13076f313e7870c5c5f24e336f9 (diff) | |
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>
| -rwxr-xr-x | jjb/securedlab/check-jinja2.sh | 9 | ||||
| -rw-r--r-- | jjb/securedlab/check-jinja2.yml | 14 |
2 files changed, 6 insertions, 17 deletions
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 @@ -65,11 +65,9 @@ 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 |