commit cbeb2ecceb2a5bc1c29722f921991f634e0dde78
author Zack Williams <zdw@opennetworking.org> Tue Jan 16 10:39:13 2018 -0700
committer Zack Williams <zdw@opennetworking.org> Tue Jan 16 10:39:13 2018 -0700
tree 95b926b90c731ad5b218d957f5d3b57ccfe89f77
parent b69aad6e738821aa160cb424e4b7cdfed40bc06e

[CORD-2542]
Don't remove build_tag if it's already been found on another image

Change-Id: I6e6106de5fe484e418f8a571acfab543d098679f

scripts/imagebuilder.py

diff --git a/scripts/imagebuilder.py b/scripts/imagebuilder.py
index 6867f88..954c657 100755
--- a/scripts/imagebuilder.py
+++ b/scripts/imagebuilder.py
@@ -873,7 +873,9 @@
                             image.status = DI_EXISTS
 
                         else:  # doesn't have good labels
-                            if has_build_tag:
+
+                            # if it has a build_tag, and a good image hasn't already been tagged
+                            if has_build_tag and (image.status != DI_EXISTS):
                                 LOG.info(" Image %s has obsolete labels and"
                                          " build_tag, remove" % pe_image['Id'])