Revert "Chore: Upgrade projects to use JDK17" for l2switch

[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 eb3a50f6a9ebf030c0843ffc8c08b153cb705757..c7229278578f38739e5a39e3e6723a7323de9fbd 100644 (file)
--- a/jjb/opendaylight-infra-update-image-list.sh
+++ b/jjb/opendaylight-infra-update-image-list.sh
@@ -1,4 +1,4 @@
-#!/bin/sh -l
+#!/bin/bash -l
 # SPDX-License-Identifier: EPL-1.0
 ##############################################################################
 # Copyright (c) 2017 The Linux Foundation and others.
@@ -14,17 +14,7 @@ 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
+lf-activate-venv --python python3 python-openstackclient
 
 cat > "$WORKSPACE/docs/cloud-images.rst" << EOF
 Following are the list of published images available to Jenkins jobs.
@@ -32,13 +22,12 @@ 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='
-'
+IFS=$'\n'
 # 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
+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