X-Git-Url: https://gerrit.linuxfoundation.org/infra/gitweb?a=blobdiff_plain;f=shell%2Fopenstack-protect-in-use-images.sh;h=a422cd8786cfd278e9c61968294f8f1e179fde3e;hb=b9eb4581940562effcf67863704a3ec2c47ceca0;hp=fe0bc0f193a3d63629696721b7f38be9acd22756;hpb=399343540de75a62321e715057798a19d8054abf;p=releng%2Fglobal-jjb.git diff --git a/shell/openstack-protect-in-use-images.sh b/shell/openstack-protect-in-use-images.sh index fe0bc0f1..a422cd87 100644 --- a/shell/openstack-protect-in-use-images.sh +++ b/shell/openstack-protect-in-use-images.sh @@ -27,10 +27,10 @@ images+=("$(grep -r IMAGE_NAME --include \*.cfg jenkins-config \ 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)" +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)" +readarray -t images <<< "$(for i in "${images[@]}"; do echo "$i"; done | sort -u)" for image in "${images[@]}"; do os_image_protected=$(openstack --os-cloud "$os_cloud" \