From: Tim Johnson <tijohnson@linuxfoundation.org>
Date: Tue, 5 Mar 2019 17:13:47 +0000 (-0800)
Subject: Minor cleanup of openstack-protect script
X-Git-Tag: v0.33.0~4
X-Git-Url: https://gerrit.linuxfoundation.org/infra/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F67%2F14767%2F3;p=releng%2Fglobal-jjb.git

Minor cleanup of openstack-protect script

Change-Id: I45070e0b364136b28e4130aed3972603e8c2e3c1
Signed-off-by: Tim Johnson <tijohnson@linuxfoundation.org>
---

diff --git a/shell/openstack-protect-in-use-images.sh b/shell/openstack-protect-in-use-images.sh
index fe0bc0f1..9152348e 100644
--- a/shell/openstack-protect-in-use-images.sh
+++ b/shell/openstack-protect-in-use-images.sh
@@ -21,18 +21,17 @@ os_cloud="${OS_CLOUD:-vex}"
 
 set -eu -o pipefail
 
-declare -a images
-images+=("$(grep -r IMAGE_NAME --include \*.cfg jenkins-config \
-    | awk -F'=' '{print $2}' | sort -u)")
-set +o pipefail  # Not all projects have images in YAML files and grep returns non-zero on 0 results
-# Ignore SC2179 since we do not want () to result in an empty array item.
-#shellcheck disable=SC2179
-images+="$(grep -r 'ZZCI - ' --include \*.yaml jjb \
-    | awk -F": " '{print $3}' | sed "s:'::;s:'$::;/^$/d" | sort -u)"
-set -o pipefail
-readarray -t images <<< "$(for i in "${images[@]}"; do echo "$i"; done | sort)"
+conf_images=("$(grep -r IMAGE_NAME --include \*.cfg jenkins-config \
+               | awk -F'=' '{print $2}' | sort -u)")
+# If there are no yaml files the 'grep' will fail, which is OK
+yaml_images=("$(grep -r 'ZZCI - ' --include \*.yaml jjb \
+               | awk -F": " '{print $3}' | sed "s:'::;s:'$::;/^$/d" \
+               | sort -u)") || true
+readarray -t images <<< "$(for i in "${conf_images[@}" "${yaml_images[@]}"; do \
+                           echo "$i"; done | sort)"
 
 for image in "${images[@]}"; do
+    [[ -z $image ]] && continue
     os_image_protected=$(openstack --os-cloud "$os_cloud" \
         image show "$image" -f value -c protected)
     echo "Protected setting for $image: $os_image_protected"