Skip to content

Commit 065e2d7

Browse files
committed
Adjust integrated-storage-import jobs
We have to address two issues simultaneously: 1. handle 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 This was change I70b4a970d7e1. 2. change the the job config to address resource constraints * partial backport of I073216d1bbdd to change swap size (we don't include the change from that patch that was needed to address changes in Bobcat-era devstack) * backporting Ieb96eb6ceb6f to change tempest concurrency Change-Id: I6cd5b8bbf39f0cfae466f0800faea5a74e960e69
1 parent 285021b commit 065e2d7

File tree

2 files changed

+12
-6
lines changed

2 files changed

+12
-6
lines changed

.zuul.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -206,6 +206,8 @@
206206
The regular tempest-integrated-storage job but with glance metadata injection
207207
post-run: playbooks/post-check-metadata-injection.yaml
208208
vars:
209+
configure_swap_size: 8192
210+
tempest_concurrency: 3
209211
zuul_copy_output:
210212
/etc/glance-remote: logs
211213
devstack_localrc:

playbooks/post-check-metadata-injection.yaml

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,16 @@
99
set -xe
1010
cirrosimg=$(glance image-list | grep cirros | cut -d" " -f 2)
1111
12-
echo "Dumping the cirros image for debugging..."
13-
glance image-show $cirrosimg
12+
# There could be more than one cirros image so traverse through the list
13+
for image in $cirrosimg
14+
do
15+
echo "Dumping the cirros image for debugging..."
16+
glance image-show $image
1417
15-
echo "Checking that the cirros image was decorated with metdata on import..."
16-
glance image-list --property-filter 'glance_devstack_test=doyouseeme?' | grep cirros
18+
echo "Checking that the cirros image was decorated with metdata on import..."
19+
glance image-list --property-filter 'glance_devstack_test=doyouseeme?' | grep $image
1720
18-
echo "Checking that the cirros image was converted to raw on import..."
19-
glance image-show $cirrosimg | egrep -e 'disk_format.*raw'
21+
echo "Checking that the cirros image was converted to raw on import..."
22+
glance image-show $image | egrep -e 'disk_format.*raw'
23+
done
2024
environment: '{{ zuul | zuul_legacy_vars }}'

0 commit comments

Comments
 (0)