From 4a6c7c4dc8101fd1113e735133bdb9aabd87764a Mon Sep 17 00:00:00 2001 From: Anil Belur Date: Thu, 3 Oct 2019 17:16:12 +0530 Subject: [PATCH] Fix auto update image script to compare image type Fix auto update image script to compare the image type before updating an the image in the source repository. This fixes the bug that updates images although they are the same flavour but a diffirent type. Issue: RELENG-2352 Change-Id: Ibaaeea41fb3d8a413e527c56b898a1fecadf5d22 Signed-off-by: Anil Belur --- releasenotes/notes/fix-image-update-script-a610a99f13f878db.yaml | 6 ++++++ shell/update-cloud-images.sh | 3 +++ 2 files changed, 9 insertions(+) create mode 100644 releasenotes/notes/fix-image-update-script-a610a99f13f878db.yaml diff --git a/releasenotes/notes/fix-image-update-script-a610a99f13f878db.yaml b/releasenotes/notes/fix-image-update-script-a610a99f13f878db.yaml new file mode 100644 index 00000000..b814489b --- /dev/null +++ b/releasenotes/notes/fix-image-update-script-a610a99f13f878db.yaml @@ -0,0 +1,6 @@ +--- +fixes: + - | + Fix the auto update image script to compare the image type before updating + an the image in the source repository. This fixes the bug that updates + images although they are the same flavour but a diffirent type. diff --git a/shell/update-cloud-images.sh b/shell/update-cloud-images.sh index 6b39c7cc..d3cd18fc 100644 --- a/shell/update-cloud-images.sh +++ b/shell/update-cloud-images.sh @@ -44,6 +44,9 @@ while read -r line ; do # var is unset and update all images on Jenkins to the latest. if [[ ${NEW_IMAGE_NAME} != all ]]; then new_image=${NEW_IMAGE_NAME} + new_image_type="${NEW_IMAGE_NAME% -*}" + # get the $new_image_type to check the image type is being compared + [[ ${new_image_type} =~ ${image_type} ]] && continue else new_image=$(openstack image list --long -f value -c Name -c Protected \ | grep "${image_type}.*False" | tail -n-1 | sed 's/ False//') -- 2.16.6