From 5ae273f51ca03aa5e02d1c146e2c73757bd7efae Mon Sep 17 00:00:00 2001 From: Anil Belur Date: Sun, 18 Sep 2022 12:09:06 +1000 Subject: [PATCH] Fix: Install missing dependency - yq Install yq in the venv that is called by the builder scripts of RTDv3 and docker jobs. Effect of changes to lf-activate-venv() from CR I559f759a8dba7 Issue-ID: RELENG-4403 Signed-off-by: Anil Belur Change-Id: If9ff9ab247812b9997ba8a2d96e5bd4a50dfd54a --- releasenotes/notes/add-venv-deps-46775189f9aa07d8.yaml | 5 +++++ shell/docker-get-container-tag.sh | 5 +++++ shell/rtdv3.sh | 2 +- 3 files changed, 11 insertions(+), 1 deletion(-) create mode 100644 releasenotes/notes/add-venv-deps-46775189f9aa07d8.yaml diff --git a/releasenotes/notes/add-venv-deps-46775189f9aa07d8.yaml b/releasenotes/notes/add-venv-deps-46775189f9aa07d8.yaml new file mode 100644 index 00000000..3c7fefe8 --- /dev/null +++ b/releasenotes/notes/add-venv-deps-46775189f9aa07d8.yaml @@ -0,0 +1,5 @@ +--- +fixes: + - | + Install yq in the venv that is called by the builder scripts of + RTDv3 and docker jobs. diff --git a/shell/docker-get-container-tag.sh b/shell/docker-get-container-tag.sh index f3beff0e..f0e7d43c 100644 --- a/shell/docker-get-container-tag.sh +++ b/shell/docker-get-container-tag.sh @@ -18,6 +18,11 @@ echo "---> docker-get-container-tag.sh" set -feu -o pipefail +# shellcheck disable=SC1090 +. ~/lf-env.sh + +lf-activate-venv --python python3 yq + tag="" if [[ $CONTAINER_TAG_METHOD == "latest" ]]; then tag="latest" diff --git a/shell/rtdv3.sh b/shell/rtdv3.sh index 66a6a76f..dab571c0 100644 --- a/shell/rtdv3.sh +++ b/shell/rtdv3.sh @@ -14,7 +14,7 @@ set -euo pipefail # shellcheck disable=SC1090 . ~/lf-env.sh -lf-activate-venv --python python3 lftools +lf-activate-venv --python python3 lftools yq watchbuild(){ echo "INFO: Running build against branch $1" -- 2.16.6