Comment 21 for bug 1886914

Reviewed: https://review.opendev.org/743260
Committed: https://git.openstack.org/cgit/openstack/tripleo-common/commit/?id=a3ccf6fb01993a2061fb5be0b188eb58c83ce83f
Submitter: Zuul
Branch: stable/train

commit a3ccf6fb01993a2061fb5be0b188eb58c83ce83f
Author: Emilien Macchi <email address hidden>
Date: Thu Jul 9 09:49:39 2020 -0400

    Relax filter_images_with_labels() and re-add kolla_version

    This patch does 2 things (on purpose for easier backport without CI
    failures):

    1) TCIB: add "kolla_version" for backward compatibility

    In TripleO CI, we run container updates using tripleo-modify-image role
    but only for the images with "kolla_version" label.

    https://opendev.org/openstack/tripleo-quickstart-extras/src/branch/master/roles/undercloud-deploy/templates/containers-prepare-parameter.yaml.j2#L13

    In the future, we'll rename this LABEL to be more TCIB specific and
    remove "kolla" from it, but for now let's have it for backward
    compatibility.

    2) image_uploader: relax logic for filter_images_with_labels()

    modify_only_with_labels is a list of labels that can be set to find out
    what images we want to modify with the tripleo-modify-image role.

    Before, all the items in the list must be present in the image Labels;
    which is too strict (e.g. kolla_version label used by quickstart doesn't
    exist in the new images with TCIB).

    Let's relax it so we will modify the image if at least one label is
    present in there.

    Related-Bug: #1886914
    Change-Id: Ia9b75f8a50c83fc38d7a4f6d5e6a9726d82fbd8c
    (cherry picked from commit af74c389e4d73041c2a052e633f8e3f7efaa550d)