From 723d9f06c79040b72769518018ef2a9a39092274 Mon Sep 17 00:00:00 2001 From: Alexandru Avadanii Date: Mon, 18 Sep 2017 23:02:55 +0200 Subject: Use pharos submodule for PDF validation Depends-on: Ic4bd75e1b2dc339c15cd4943dfc5a1c74c68b094 Change-Id: I9d6807f3d24cee8d9a03955112a8c179d9ea7d14 Signed-off-by: Alexandru Avadanii --- .gitmodules | 3 +++ check-jinja2.sh | 10 ++++++---- pharos | 1 + 3 files changed, 10 insertions(+), 4 deletions(-) create mode 100644 .gitmodules create mode 160000 pharos diff --git a/.gitmodules b/.gitmodules new file mode 100644 index 0000000..fa83351 --- /dev/null +++ b/.gitmodules @@ -0,0 +1,3 @@ +[submodule "pharos"] + path = pharos + url = https://github.com/opnfv/pharos diff --git a/check-jinja2.sh b/check-jinja2.sh index 4c1927d..0a79364 100755 --- a/check-jinja2.sh +++ b/check-jinja2.sh @@ -1,9 +1,11 @@ #!/bin/bash set +x set -o errexit +git submodule update --init --remote 2>/dev/null +GEN_CFG="./pharos/config/utils/generate_config.py" 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') + while IFS= read -r jinja_templates; do + echo "$GEN_CFG -y $lab_configs -j $jinja_templates" + $GEN_CFG -y $lab_configs -j $jinja_templates + done < <(find pharos/config/installers/ -name '*.j2') done diff --git a/pharos b/pharos new file mode 160000 index 0000000..3d98d06 --- /dev/null +++ b/pharos @@ -0,0 +1 @@ +Subproject commit 3d98d06d697d38fd6bcbf66b29eecd1b61d0ae0b -- cgit 1.2.3-korg