Fix rtd merge job to handle new tag uploaded

[releng/global-jjb.git] / shell / jjb-install.sh

diff --git a/shell/jjb-install.sh b/shell/jjb-install.sh
index 48af507..baaa5d7 100644 (file)
--- a/shell/jjb-install.sh
+++ b/shell/jjb-install.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/bash -l
 # SPDX-License-Identifier: EPL-1.0
 ##############################################################################
 # Copyright (c) 2017 The Linux Foundation and others.
@@ -14,12 +14,15 @@ echo "---> jjb-install.sh"
 # DO NOT set -u as virtualenv's activate script has unbound variables
 set -e -o pipefail
 
-virtualenv "/tmp/v/jjb"
-# shellcheck source=/tmp/v/jjb/bin/activate disable=SC1091
-source "/tmp/v/jjb/bin/activate"
-pip install --quiet --upgrade pip
-pip install --quiet --upgrade pipdeptree
-pip install --quiet --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 Dependency Tree"
-pipdeptree
+echo "----> pip freeze"
+pip freeze