X-Git-Url: https://gerrit.linuxfoundation.org/infra/gitweb?a=blobdiff_plain;f=shell%2Fjjb-install.sh;h=baaa5d70f852287a52c909bd73935e66b0227217;hb=11bccd3d96d180f93ae96cd330e23565ba351aa5;hp=af2f42c5f86741825ab479dc7b43a6ff8cdd1189;hpb=2c2b7ab2906106cf553e0ab358229496a5f1558e;p=releng%2Fglobal-jjb.git diff --git a/shell/jjb-install.sh b/shell/jjb-install.sh index af2f42c5..baaa5d70 100644 --- a/shell/jjb-install.sh +++ b/shell/jjb-install.sh @@ -1,5 +1,5 @@ -#!/bin/bash -# @License EPL-1.0 +#!/bin/bash -l +# SPDX-License-Identifier: EPL-1.0 ############################################################################## # Copyright (c) 2017 The Linux Foundation and others. # @@ -14,9 +14,15 @@ echo "---> jjb-install.sh" # DO NOT set -u as virtualenv's activate script has unbound variables set -e -o pipefail -virtualenv "$WORKSPACE/.virtualenvs/jjb" -# shellcheck source=./.virtualenvs/jjb/bin/activate disable=SC1091 -source "$WORKSPACE/.virtualenvs/jjb/bin/activate" -pip install --upgrade pip -pip install --upgrade "jenkins-job-builder==$JJB_VERSION" +# Create a virtualenv in a temporary directoy and write it down to used +# or cleaned up later; cleanup is done in the script jjb-cleanup.sh. +JJB_VENV="$(mktemp -d)" +export JJB_VENV +virtualenv "$JJB_VENV" +echo "JJB_VENV=$JJB_VENV" > "$WORKSPACE/.jjb.properties" +# shellcheck source=$VENV_DIR/bin/activate disable=SC1091 +source "$JJB_VENV/bin/activate" +python -m pip install --quiet --upgrade "jenkins-job-builder==$JJB_VERSION" + +echo "----> pip freeze" pip freeze