From d3181bf202b6b3b9f2d8861b9a32a0c482da4873 Mon Sep 17 00:00:00 2001 From: melanie witt Date: Wed, 6 Dec 2023 18:56:25 +0000 Subject: [PATCH] Set UEC image vars for jobs not defined in Nova This is another follow up for change I1a6468fbfa51eedec0ab91d73f313784a9a618a0 which missed setting the *uec_image_vars for jobs that are not defined in Nova. For example, the tempest-integrated-compute job is not defined in Nova and if we don't set *uec_image_vars for it, it will not use the UEC image and will instead use the default full image. This also sets *uec_image_vars for one job defined in Nova, nova-osprofiler-redis, that was missed in the original change. Change-Id: Ia8741d46c28277e9addadf0e2a568c3ad86fb8dc --- .zuul.yaml | 81 ++++++++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 79 insertions(+), 2 deletions(-) diff --git a/.zuul.yaml b/.zuul.yaml index 7d332f9c8e19..4b5556cfdf84 100644 --- a/.zuul.yaml +++ b/.zuul.yaml @@ -703,6 +703,8 @@ tox_envlist: all # Run compute API and only the test_server_basic_ops scenario tests. tempest_test_regex: ^tempest\.(scenario\.test_server_basic_ops|(api\.compute)) + devstack_localrc: + <<: *uec_image_vars - job: name: nova-ceph-multistore @@ -838,6 +840,9 @@ - ironic-tempest-ipa-wholedisk-bios-agent_ipmitool-tinyipa: voting: false irrelevant-files: *nova-base-irrelevant-files + vars: + devstack_localrc: + <<: *uec_image_vars - nova-ceph-multistore: irrelevant-files: *nova-base-irrelevant-files - neutron-linuxbridge-tempest: @@ -846,6 +851,9 @@ # so that we only run it on changes to networking and libvirt/vif # code; we don't need to run this on all changes. - ^(?!nova/network/.*)(?!nova/virt/libvirt/vif.py).*$ + vars: + devstack_localrc: + <<: *uec_image_vars - nova-live-migration - nova-live-migration-ceph - nova-lvm @@ -877,24 +885,42 @@ - ^setup.cfg$ - ^tools/.*$ - ^tox.ini$ + vars: + devstack_localrc: + <<: *uec_image_vars - tempest-integrated-compute-enforce-scope-new-defaults: irrelevant-files: *policies-irrelevant-files - tempest-integrated-compute-rbac-old-defaults: irrelevant-files: *policies-irrelevant-files - grenade-skip-level-always: irrelevant-files: *policies-irrelevant-files + vars: + devstack_localrc: + <<: *uec_image_vars - nova-grenade-multinode: irrelevant-files: *policies-irrelevant-files - tempest-ipv6-only: irrelevant-files: *nova-base-irrelevant-files + vars: + devstack_localrc: + <<: *uec_image_vars - openstacksdk-functional-devstack: irrelevant-files: *nova-base-irrelevant-files + vars: + devstack_localrc: + <<: *uec_image_vars - cyborg-tempest: irrelevant-files: *nova-base-irrelevant-files voting: false + vars: + devstack_localrc: + <<: *uec_image_vars - barbican-tempest-plugin-simple-crypto: irrelevant-files: *nova-base-irrelevant-files voting: false + vars: + devstack_localrc: + <<: *uec_image_vars gate: jobs: - nova-live-migration @@ -912,53 +938,104 @@ # so that we only run it on changes to networking and libvirt/vif # code; we don't need to run this on all changes. - ^(?!nova/network/.*)(?!nova/virt/libvirt/vif.py).*$ + vars: + devstack_localrc: + <<: *uec_image_vars - tempest-integrated-compute: - irrelevant-files: *policies-irrelevant-files + irrelevant-files: *policies-irrelevant-files + vars: + devstack_localrc: + <<: *uec_image_vars - tempest-integrated-compute-enforce-scope-new-defaults: irrelevant-files: *policies-irrelevant-files - tempest-integrated-compute-rbac-old-defaults: irrelevant-files: *policies-irrelevant-files - grenade-skip-level-always: irrelevant-files: *policies-irrelevant-files + vars: + devstack_localrc: + <<: *uec_image_vars - nova-grenade-multinode: irrelevant-files: *policies-irrelevant-files - tempest-ipv6-only: irrelevant-files: *nova-base-irrelevant-files + vars: + devstack_localrc: + <<: *uec_image_vars - openstacksdk-functional-devstack: irrelevant-files: *nova-base-irrelevant-files + vars: + devstack_localrc: + <<: *uec_image_vars periodic-weekly: jobs: # Runs emulation feature functionality test less frequently due # to being the initial release and experimental in nature. - nova-emulation - - tempest-centos9-stream-fips + - tempest-centos9-stream-fips: + vars: + devstack_localrc: + <<: *uec_image_vars experimental: jobs: - ironic-tempest-bfv: irrelevant-files: *nova-base-irrelevant-files + vars: + devstack_localrc: + <<: *uec_image_vars - ironic-tempest-ipa-wholedisk-direct-tinyipa-multinode: irrelevant-files: *nova-base-irrelevant-files + vars: + devstack_localrc: + <<: *uec_image_vars - devstack-plugin-nfs-tempest-full: irrelevant-files: *nova-base-irrelevant-files + vars: + devstack_localrc: + <<: *uec_image_vars - nova-osprofiler-redis - tempest-pg-full: irrelevant-files: *nova-base-irrelevant-files + vars: + devstack_localrc: + <<: *uec_image_vars - nova-tempest-full-oslo.versionedobjects: irrelevant-files: *nova-base-irrelevant-files - nova-tempest-v2-api: irrelevant-files: *nova-base-irrelevant-files - neutron-ovs-tempest-dvr-ha-multinode-full: irrelevant-files: *nova-base-irrelevant-files + vars: + devstack_localrc: + <<: *uec_image_vars - neutron-ovs-tempest-iptables_hybrid: irrelevant-files: *nova-base-irrelevant-files + vars: + devstack_localrc: + <<: *uec_image_vars - os-vif-ovs: irrelevant-files: *nova-base-irrelevant-files + vars: + devstack_localrc: + <<: *uec_image_vars - devstack-plugin-ceph-compute-local-ephemeral: irrelevant-files: *nova-base-irrelevant-files + vars: + devstack_localrc: + <<: *uec_image_vars - devstack-tobiko-nova: irrelevant-files: *nova-base-irrelevant-files + vars: + devstack_localrc: + <<: *uec_image_vars - tempest-centos9-stream-fips: irrelevant-files: *nova-base-irrelevant-files + vars: + devstack_localrc: + <<: *uec_image_vars - nova-emulation - tempest-integrated-compute-centos-9-stream: irrelevant-files: *nova-base-irrelevant-files + vars: + devstack_localrc: + <<: *uec_image_vars