diff --git a/.zuul.yaml b/.zuul.yaml index 4b2e3ed775..5040a1e79c 100644 --- a/.zuul.yaml +++ b/.zuul.yaml @@ -208,6 +208,26 @@ python_version: 3.6 tox_envlist: functional-py36 +- job: + name: tempest-integrated-storage-import-workflow + parent: tempest-integrated-storage + description: | + The regular tempest-integrated-storage job but with glance metadata injection + post-run: playbooks/post-check-metadata-injection.yaml + vars: + devstack_localrc: + GLANCE_STANDALONE: True + GLANCE_USE_IMPORT_WORKFLOW: True + devstack_local_conf: + post-config: + $GLANCE_IMAGE_IMPORT_CONF: + image_import_opts: + image_import_plugins: "['inject_image_metadata']" + inject_metadata_properties: + ignore_user_roles: + inject: | + "glance_devstack_test":"doyouseeme?" + - project: templates: - check-requirements @@ -239,6 +259,8 @@ - ^\.zuul\.yaml$ - tempest-integrated-storage: irrelevant-files: *tempest-irrelevant-files + - tempest-integrated-storage-import-workflow: + irrelevant-files: *tempest-irrelevant-files - grenade: irrelevant-files: *tempest-irrelevant-files - tempest-ipv6-only: @@ -250,6 +272,8 @@ - openstack-tox-functional-py38 - tempest-integrated-storage: irrelevant-files: *tempest-irrelevant-files + - tempest-integrated-storage-import-workflow: + irrelevant-files: *tempest-irrelevant-files - grenade: irrelevant-files: *tempest-irrelevant-files - tempest-ipv6-only: diff --git a/playbooks/post-check-metadata-injection.yaml b/playbooks/post-check-metadata-injection.yaml new file mode 100644 index 0000000000..1d9eca7623 --- /dev/null +++ b/playbooks/post-check-metadata-injection.yaml @@ -0,0 +1,12 @@ +- hosts: controller + tasks: + - name: Run glance validation script + shell: + executable: /bin/bash + cmd: | + set -xe + source /opt/stack/devstack/openrc + # NOTE(danms): just dump the image so we can see it in case the check fails + openstack image show $(openstack image list -f csv -c ID -c Name --quote none | grep cirros | cut -d , -f 1) + openstack image list -f value -c Name --property 'glance_devstack_test=doyouseeme?' | grep cirros + environment: '{{ zuul | zuul_legacy_vars }}'