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 Remove openstack-tox-functional-py36-fips as there is no job definition for it. Change-Id: I6cd5b8bbf39f0cfae466f0800faea5a74e960e69 (cherry picked from commit065e2d7e9e
) (cherry picked from commit28b05a7cc1
)
This commit is contained in:
parent
bdd06d738c
commit
8fb607e002
@ -213,6 +213,8 @@
|
||||
The regular tempest-integrated-storage job but with glance metadata injection
|
||||
post-run: playbooks/post-check-metadata-injection.yaml
|
||||
vars:
|
||||
configure_swap_size: 8192
|
||||
tempest_concurrency: 3
|
||||
zuul_copy_output:
|
||||
/etc/glance-remote: logs
|
||||
devstack_localrc:
|
||||
|
@ -9,12 +9,16 @@
|
||||
set -xe
|
||||
cirrosimg=$(glance image-list | grep cirros | cut -d" " -f 2)
|
||||
|
||||
# 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 $cirrosimg
|
||||
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
|
||||
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'
|
||||
glance image-show $image | egrep -e 'disk_format.*raw'
|
||||
done
|
||||
environment: '{{ zuul | zuul_legacy_vars }}'
|
||||
|
Loading…
Reference in New Issue
Block a user