From 53a8bdfd0f05f7d29ac34a44496efb2ed081250f Mon Sep 17 00:00:00 2001 From: Anil Belur Date: Tue, 30 Aug 2022 21:31:05 +1000 Subject: [PATCH] Fix: Install yq through lf-activate-venv Install yq through lf-activate-venv instead of the python tools install script. Change-Id: Ifd36a7820854e2a1ee15447c966fc3e4629c9fe4 Issue-ID: RELENG-4357 Signed-off-by: Anil Belur --- releasenotes/notes/fix-install-pre-reqs-yq-e60189995577008a.yaml | 8 ++++++++ shell/jjb-verify-build-nodes.sh | 9 +++++++++ 2 files changed, 17 insertions(+) create mode 100644 releasenotes/notes/fix-install-pre-reqs-yq-e60189995577008a.yaml diff --git a/releasenotes/notes/fix-install-pre-reqs-yq-e60189995577008a.yaml b/releasenotes/notes/fix-install-pre-reqs-yq-e60189995577008a.yaml new file mode 100644 index 00000000..4309c2ab --- /dev/null +++ b/releasenotes/notes/fix-install-pre-reqs-yq-e60189995577008a.yaml @@ -0,0 +1,8 @@ +--- +issues: + - | + yq: command not found +fixes: + - | + Install yq through lf-activate-venv rather than using the python + tools install script. diff --git a/shell/jjb-verify-build-nodes.sh b/shell/jjb-verify-build-nodes.sh index 9c5bfecb..c37af67c 100644 --- a/shell/jjb-verify-build-nodes.sh +++ b/shell/jjb-verify-build-nodes.sh @@ -100,6 +100,15 @@ if [[ -n ${EXTERNAL_LABELS:-} ]]; then done fi +# shellcheck disable=SC1090 +source ~/lf-env.sh + +lf-activate-venv yq + +# show installed versions +python -m pip --version +python -m pip freeze + echo "INFO: label list has ${#labels[@]} entries:" echo "INFO:" "${labels[@]}" -- 2.16.6