From d47803613d501b18f9fa4f6aa3c899bd16f9ddde Mon Sep 17 00:00:00 2001 From: Rajat Dhasmana Date: Wed, 14 Jun 2023 09:24:03 +0000 Subject: [PATCH] Handle case for multiple cirros images The change[1] configures multiple images for the devstack-tempest job and all the jobs deriving from it. This causes problem with the current post-check-metadata-injection.yaml playbook since we only expect one cirros image and perform steps accordingly. This change modifies the playbook to handle multiple cirros images. Failure in the glance-multistore-cinder-import job can be seen here[2]. [1] https://review.opendev.org/c/openstack/tempest/+/831018 [2] https://zuul.opendev.org/t/openstack/build/68a4d3ec6ce04c87b21d73a333f5b5cd/log/job-output.txt#23161 Change-Id: I70b4a970d7e16174f715c54bdae9467cc321c13e --- playbooks/post-check-metadata-injection.yaml | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/playbooks/post-check-metadata-injection.yaml b/playbooks/post-check-metadata-injection.yaml index 178866ba1b..2c273693a5 100644 --- a/playbooks/post-check-metadata-injection.yaml +++ b/playbooks/post-check-metadata-injection.yaml @@ -9,12 +9,16 @@ set -xe cirrosimg=$(glance image-list | grep cirros | cut -d" " -f 2) - echo "Dumping the cirros image for debugging..." - glance image-show $cirrosimg + # There could be more than one cirros image so traverse through the list + for image in $cirrosimg + do + echo "Dumping the cirros image for debugging..." + glance image-show $image - echo "Checking that the cirros image was decorated with metdata on import..." - glance image-list --property-filter 'glance_devstack_test=doyouseeme?' | grep cirros + echo "Checking that the cirros image was decorated with metdata on import..." + glance image-list --property-filter 'glance_devstack_test=doyouseeme?' | grep $image - echo "Checking that the cirros image was converted to raw on import..." - glance image-show $cirrosimg | egrep -e 'disk_format.*raw' + echo "Checking that the cirros image was converted to raw on import..." + glance image-show $image | egrep -e 'disk_format.*raw' + done environment: '{{ zuul | zuul_legacy_vars }}'