From 54d425f8efda53684aa6da583760066dc3de41cd Mon Sep 17 00:00:00 2001 From: Anil Belur Date: Wed, 12 Apr 2023 20:50:29 +1000 Subject: [PATCH] Fix: Use the python3 module opt to call pip This fixes the issue where pip is not available in the venv path. Error: /tmp/venv-knWF/bin/pip: No such file or directory Issue-ID: RELENG-4688 Change-Id: I6d6edeb8c3cdf0c36f271412d3d2e96db96f6e4b Signed-off-by: Anil Belur --- jenkins-init-scripts/lf-env.sh | 7 ++++--- releasenotes/notes/use-python-module-option-33f6eeaf6271c04d.yaml | 5 +++++ 2 files changed, 9 insertions(+), 3 deletions(-) create mode 100644 releasenotes/notes/use-python-module-option-33f6eeaf6271c04d.yaml diff --git a/jenkins-init-scripts/lf-env.sh b/jenkins-init-scripts/lf-env.sh index f80dc798..8e942a7a 100644 --- a/jenkins-init-scripts/lf-env.sh +++ b/jenkins-init-scripts/lf-env.sh @@ -242,15 +242,16 @@ lf-activate-venv () { echo "${FUNCNAME[0]}(): INFO: Save venv in file: $venv_file" fi - "$lf_venv/bin/pip" install --upgrade --quiet pip virtualenv || return 1 + "$lf_venv/bin/python3" -m pip install --upgrade --quiet pip \ + virtualenv || return 1 if [[ -z $pkg_list ]]; then echo "${FUNCNAME[0]}(): WARNING: No packages to install" else echo "${FUNCNAME[0]}(): INFO: Installing: $pkg_list" # $pkg_list is expected to be unquoted # shellcheck disable=SC2086 - "$lf_venv/bin/pip" install --upgrade --quiet --upgrade-strategy eager \ - $pkg_list || return 1 + "$lf_venv/bin/python3" -m pip install --upgrade --quiet \ + --upgrade-strategy eager $pkg_list || return 1 fi ;; *) diff --git a/releasenotes/notes/use-python-module-option-33f6eeaf6271c04d.yaml b/releasenotes/notes/use-python-module-option-33f6eeaf6271c04d.yaml new file mode 100644 index 00000000..681cdf9c --- /dev/null +++ b/releasenotes/notes/use-python-module-option-33f6eeaf6271c04d.yaml @@ -0,0 +1,5 @@ +--- +fixes: + - | + Use the python3 module option instead of calling pip directly. + This fixes the issue when pip is not available the PATH. -- 2.16.6