Merge "Revert "Fix: bashisms - step 2""

[releng/builder.git] / jjb / opendaylight-infra-update-image-list.sh

diff --git a/jjb/opendaylight-infra-update-image-list.sh b/jjb/opendaylight-infra-update-image-list.sh
index 1122dbd609e4dc9c78ad7ac799e39e4aa4adaf45..c7ac71731cd2ac10abf868a035c16e896a2ed03c 100644 (file)
--- a/jjb/opendaylight-infra-update-image-list.sh
+++ b/jjb/opendaylight-infra-update-image-list.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/bash -l
 # SPDX-License-Identifier: EPL-1.0
 ##############################################################################
 # Copyright (c) 2017 The Linux Foundation and others.
@@ -9,15 +9,25 @@
 # http://www.eclipse.org/legal/epl-v10.html
 ##############################################################################
 
-virtualenv "/tmp/v/openstack"
-# shellcheck source=/tmp/v/openstack/bin/activate disable=SC1091
-source "/tmp/v/openstack/bin/activate"
-pip install --upgrade --quiet "pip<10.0.0" setuptools
-pip install --upgrade --quiet python-openstackclient
-pip freeze
+set -e -o pipefail
+
+# shellcheck disable=SC1090
+. ~/lf-env.sh
+
+# Check if openstack venv was previously created
+if [ -f "/tmp/.os_lf_venv" ]; then
+    os_lf_venv=$(cat "/tmp/.os_lf_venv")
+fi
+
+if [ -d "${os_lf_venv}" ] && [ -f "${os_lf_venv}/bin/openstack" ]; then
+    echo "Re-use existing venv: ${os_lf_venv}"
+    PATH=$os_lf_venv/bin:$PATH
+else
+    lf-activate-venv --python python3 python-openstackclient
+fi
 
 cat > "$WORKSPACE/docs/cloud-images.rst" << EOF
-Following are the list of published images available to be used with Jenkins jobs.
+Following are the list of published images available to Jenkins jobs.
 
 EOF
 # Blank line before EOF is on purpose to ensure there is spacing.