Consolidate recent view into 1

[releng/builder.git] / jjb / odl-openstack-check-image-protection.sh

diff --git a/jjb/odl-openstack-check-image-protection.sh b/jjb/odl-openstack-check-image-protection.sh
index 980e70e15f798f28feaea8c65f41d8845897dfe7..77a669e0bbbe6a59628228f4c87284677ce35f8e 100644 (file)
--- a/jjb/odl-openstack-check-image-protection.sh
+++ b/jjb/odl-openstack-check-image-protection.sh
@@ -20,9 +20,15 @@ echo "---> Check image protection"
 # shellcheck source=/tmp/v/openstack/bin/activate disable=SC1091
 source "/tmp/v/openstack/bin/activate"
 
+declare -a yaml_images
+readarray -t yaml_images <<< "$(grep -r _system_image: --include \*.yaml \
+    | awk -F": " -e '{print $3}' | sed "s:'::;s:'$::;/^$/d" | sort -u)"
+declare -a cfg_images
+readarray -t cfg_images <<< "$(grep -r IMAGE_NAME --include \*.cfg \
+    | awk -F'=' -e '{print $2}' | sort -u)"
+combined=("${yaml_images[@]}" "${cfg_images[@]}")
 declare -a images
-readarray -t images <<< "$(grep -r _system_image: --include \*.yaml \
-    | awk -F": " -e '{print $3}' | sed "s:'::;s:'$::;/^$/d" | sort | uniq)"
+readarray -t images <<< "$(printf '%s\n' "${combined[@]}" | sort -u)"
 
 for image in "${images[@]}"; do
     os_image_protected=$(openstack --os-cloud "$OS_CLOUD" image show "$image" -f value -c protected)