X-Git-Url: https://gerrit.linuxfoundation.org/infra/gitweb?a=blobdiff_plain;f=shell%2Fopenstack-protect-in-use-images.sh;h=a422cd8786cfd278e9c61968294f8f1e179fde3e;hb=refs%2Fchanges%2F25%2F65025%2F5;hp=08727f61cd0eb8ad62a272894afd180a2f0ef34f;hpb=a254df8d0b68df0daf98ba407643d84cd75f5b98;p=releng%2Fglobal-jjb.git

diff --git a/shell/openstack-protect-in-use-images.sh b/shell/openstack-protect-in-use-images.sh
index 08727f61..a422cd87 100644
--- a/shell/openstack-protect-in-use-images.sh
+++ b/shell/openstack-protect-in-use-images.sh
@@ -21,17 +21,18 @@ os_cloud="${OS_CLOUD:-vex}"
 
 set -eu -o pipefail
 
-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)"
+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 -e "s:'::;s:'$::;/^$/d" -e 's/^"//' -e 's/"$//' | sort -u)")
+set -o pipefail
+readarray -t images <<< "$(for i in "${images[@]}"; do echo "$i"; done | sort -u)"
 
 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"