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=-c;p=releng%2Fglobal-jjb.git

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

f02f2f445600af0b0b116bee97bf5d76629ad4b4
diff --combined jenkins-init-scripts/lf-env.sh
index 8e942a7a,16bf8109..7403a69f
--- a/jenkins-init-scripts/lf-env.sh
+++ b/jenkins-init-scripts/lf-env.sh
@@@ -209,6 -209,7 +209,7 @@@ lf-activate-venv () 
              pyenv versions
              if command -v pyenv 1>/dev/null 2>&1; then
                  eval "$(pyenv init - --no-rehash)"
+                 # shellcheck disable=SC2046
                  pyenv local $(lf-pyver "${python}")
              fi
          fi
@@@ -242,16 -243,15 +243,16 @@@
              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
          ;;
      *)