From: Anil Belur <abelur@linuxfoundation.org>
Date: Thu, 3 Oct 2019 11:46:12 +0000 (+0530)
Subject: Fix auto update image script to compare image type
X-Git-Tag: v0.45.0~1^2
X-Git-Url: https://gerrit.linuxfoundation.org/infra/gitweb?a=commitdiff_plain;h=4a6c7c4dc8101fd1113e735133bdb9aabd87764a;p=releng%2Fglobal-jjb.git

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 <abelur@linuxfoundation.org>
---

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//')