X-Git-Url: https://gerrit.linuxfoundation.org/infra/gitweb?a=blobdiff_plain;f=jenkins-init-scripts%2Flf-env.sh;h=7403a69f062e001ac9eed16b0b3868756096f50d;hb=9268e4ab2c79a5605c59865ac5dd96231de75518;hp=f80dc79809cf013460804abb6e3e44d2a77928eb;hpb=8e77f700bd14d85c5862cc71fa38a2b8655fe214;p=releng%2Fglobal-jjb.git diff --git a/jenkins-init-scripts/lf-env.sh b/jenkins-init-scripts/lf-env.sh index f80dc798..7403a69f 100644 --- a/jenkins-init-scripts/lf-env.sh +++ b/jenkins-init-scripts/lf-env.sh @@ -209,6 +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,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 ;; *)