From: Anil Belur <abelur@linuxfoundation.org>
Date: Wed, 12 Apr 2023 14:17:50 +0000 (+0000)
Subject: Merge "Refactor: pre-commit cleanups"
X-Git-Tag: v0.86.0~4
X-Git-Url: https://gerrit.linuxfoundation.org/infra/gitweb?a=commitdiff_plain;h=f02f2f445600af0b0b116bee97bf5d76629ad4b4;hp=cf343b44e356c5f89f673c4331249179c5bd85c9;p=releng%2Fglobal-jjb.git

Merge "Refactor: pre-commit cleanups"
---

diff --git a/jenkins-init-scripts/lf-env.sh b/jenkins-init-scripts/lf-env.sh
index 16bf8109..7403a69f 100644
--- a/jenkins-init-scripts/lf-env.sh
+++ b/jenkins-init-scripts/lf-env.sh
@@ -243,15 +243,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.