X-Git-Url: https://gerrit.linuxfoundation.org/infra/gitweb?a=blobdiff_plain;f=shell%2Finfo-file-validate.sh;h=40d96b6daa87e364fb59c0c14a3ef01ca6d194fb;hb=9268e4ab2c79a5605c59865ac5dd96231de75518;hp=4b80672b5a76911c57b65a6f679edb513691052c;hpb=471ce0c4f693f556a6714c7e0996f24f00d155af;p=releng%2Fglobal-jjb.git diff --git a/shell/info-file-validate.sh b/shell/info-file-validate.sh index 4b80672b..40d96b6d 100755 --- a/shell/info-file-validate.sh +++ b/shell/info-file-validate.sh @@ -12,10 +12,10 @@ echo '--> info-file-validate.sh' set -e -o pipefail PROJECT="${PROJECT:-None}" -virtualenv --quiet "/tmp/v/info" -# shellcheck source=/tmp/v/info/bin/activate disable=SC1091 -source "/tmp/v/info/bin/activate" -pip install PyYAML jsonschema rfc3987 yamllint yq +# shellcheck disable=SC1090 +source ~/lf-env.sh +lf-activate-venv zipp==1.1.0 PyYAML jsonschema rfc3987 yamllint yq +pip freeze # Download info-schema.yaml and yaml-verfy-schema.py wget -q https://raw.githubusercontent.com/lfit/releng-global-jjb/master/schema/info-schema.yaml \ @@ -32,12 +32,12 @@ python yaml-verify-schema.py \ REPO_LIST="$(yq -r '.repositories[]' INFO.yaml)" while IFS= read -r project; do - if [[ "$project" == "$PROJECT" ]]; then - echo "$project is valid" - else - echo "ERROR: $project is invalid" - echo "INFO.yaml file may only list one repository" - echo "Repository must match $PROJECT" - exit 1 - fi + if [[ "$project" == "$PROJECT" ]]; then + echo "$project is valid" + else + echo "ERROR: $project is invalid" + echo "INFO.yaml file may only list one repository" + echo "Repository must match $PROJECT" + exit 1 + fi done <<< "$REPO_LIST"