From 04f1770f4aed60b07bba1db7c87920fa03af536c Mon Sep 17 00:00:00 2001 From: Aric Gardner Date: Thu, 12 Mar 2020 16:26:27 -0400 Subject: [PATCH] Use lf-env for info-file-validate Job was failing due to using python2 use lf-env to manage the environment. ISSUE-ID: IT-19236 Signed-off-by: Aric Gardner Change-Id: I388ce7d8471e62efdae8c6131b4924cd89bfcc53 --- releasenotes/notes/info-validate-yamllint-17f6f2224312719d.yaml | 5 +++++ shell/info-file-validate.sh | 8 ++++---- 2 files changed, 9 insertions(+), 4 deletions(-) create mode 100644 releasenotes/notes/info-validate-yamllint-17f6f2224312719d.yaml diff --git a/releasenotes/notes/info-validate-yamllint-17f6f2224312719d.yaml b/releasenotes/notes/info-validate-yamllint-17f6f2224312719d.yaml new file mode 100644 index 00000000..cd8ed16f --- /dev/null +++ b/releasenotes/notes/info-validate-yamllint-17f6f2224312719d.yaml @@ -0,0 +1,5 @@ +--- +fixes: + - | + Switch info-file-validate.sh to use lf-activate-venv + moves job from python2 to python3 diff --git a/shell/info-file-validate.sh b/shell/info-file-validate.sh index 4b80672b..8a4bc6b3 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 \ -- 2.16.6