X-Git-Url: https://gerrit.linuxfoundation.org/infra/gitweb?a=blobdiff_plain;f=jenkins-init-scripts%2Flf-env.sh;h=a85fae0f627b70c82524e43df90a74dae1db3339;hb=5082a11f31ae10c69d23417d6466e24f4b2bcad6;hp=91aa80c62f9d60b8d6ce5ef6f4aeb951c88da358;hpb=e3f247c4d61f054872466a5bbf44afc22e8f1586;p=releng%2Fglobal-jjb.git

diff --git a/jenkins-init-scripts/lf-env.sh b/jenkins-init-scripts/lf-env.sh
index 91aa80c6..a85fae0f 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
@@ -217,7 +218,7 @@ lf-activate-venv () {
         for arg in "$@"; do
             case $arg in
                 jenkins-job-builder)
-                    pkg_list+="jenkins-job-builder==${JJB_VERSION:-2.8.0} " ;;
+                    pkg_list+="jenkins-job-builder==${JJB_VERSION:-6.3.0} " ;;
                 *)                   pkg_list+="$arg " ;;
             esac
         done
@@ -242,16 +243,17 @@ 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"
-            return 0
+        else
+            echo "${FUNCNAME[0]}(): INFO: Installing: $pkg_list"
+            # $pkg_list is expected to be unquoted
+            # shellcheck disable=SC2086
+            "$lf_venv/bin/python3" -m pip install --upgrade --quiet \
+                        --upgrade-strategy eager $pkg_list || return 1
         fi
-        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-echo-stderr "${FUNCNAME[0]}(): ERROR: No support for: $python"