X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fopendaylight-infra-update-image-list.sh;h=c7ac71731cd2ac10abf868a035c16e896a2ed03c;hb=584cbf477d45dd2a9d6401e892d35275c4c3234e;hp=48ac3e26196a486daab6b7654ab68d74c94df9a4;hpb=39ad49f2436d89b0ad6a0645202c5269b30a9c69;p=releng%2Fbuilder.git

diff --git a/jjb/opendaylight-infra-update-image-list.sh b/jjb/opendaylight-infra-update-image-list.sh
index 48ac3e261..c7ac71731 100644
--- a/jjb/opendaylight-infra-update-image-list.sh
+++ b/jjb/opendaylight-infra-update-image-list.sh
@@ -1,21 +1,44 @@
-#!/bin/bash
-virtualenv "$WORKSPACE/.venv"
+#!/bin/bash -l
+# SPDX-License-Identifier: EPL-1.0
+##############################################################################
+# Copyright (c) 2017 The Linux Foundation and others.
+#
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v1.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-v10.html
+##############################################################################
+
+set -e -o pipefail
+
 # shellcheck disable=SC1090
-source "$WORKSPACE/.venv/bin/activate"
-PYTHON="$WORKSPACE/.venv/bin/python"
-$PYTHON -m pip install --upgrade --quiet pip
-$PYTHON -m pip install --upgrade --quiet python-openstackclient python-heatclient
-$PYTHON -m pip freeze
+. ~/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.
 
 IFS=$'\n'
-IMAGES=($(openstack image list --public -f value -c Name))
+# We purposely want globbing here to build images list
+# shellcheck disable=SC2207
+IMAGES=($(openstack image list --long -f value -c Name -c Protected \
+    | grep 'ZZCI.*True' | sed 's/ True//'))
 for i in "${IMAGES[@]}"; do
+    echo "Adding image $i"
     echo "* $i" >> "$WORKSPACE/docs/cloud-images.rst"
 done