From 81e3b0850c2b5042f6cf5b3581be18e504641065 Mon Sep 17 00:00:00 2001 From: Dan Smith Date: Wed, 15 May 2024 07:17:29 -0700 Subject: [PATCH] Stop using split UEC image (mostly) This reverts us back to using the standard disk image for most of our tests, which is more representative of how people actually use nova. This leaves the UEC image on a few jobs for the sake of comparison data for the time being, and because we should actually test that code path if we're going to say we support it. Change-Id: I16ed92d342464325d4bef33c1e22b328bcfbe7d6 (cherry picked from commit eed3e2b47ffea24d08ad7a85a4e9c36ef56d815e) --- .zuul.yaml | 92 +----------------------------------------------------- 1 file changed, 1 insertion(+), 91 deletions(-) diff --git a/.zuul.yaml b/.zuul.yaml index 70812e82bcd2..9bde50655b9f 100644 --- a/.zuul.yaml +++ b/.zuul.yaml @@ -182,7 +182,6 @@ # test_live_migration_with_trunk in this job to keep tempest_test_regex: (^tempest\..*compute\..*(migration|resize|reboot).*) devstack_localrc: - <<: *uec_image_vars Q_AGENT: openvswitch Q_ML2_TENANT_NETWORK_TYPE: vxlan Q_ML2_PLUGIN_MECHANISM_DRIVERS: openvswitch @@ -224,7 +223,6 @@ group-vars: subnode: devstack_localrc: - <<: *uec_image_vars Q_AGENT: openvswitch Q_ML2_TENANT_NETWORK_TYPE: vxlan Q_ML2_PLUGIN_MECHANISM_DRIVERS: openvswitch @@ -276,8 +274,6 @@ tempest_test_regex: (^tempest\.api\.compute\.admin\.(test_live_migration|test_migration)) # revert this when bug #1940425 is fixed in neutron tempest_exclude_regex: (test_live_migration_with_trunk) - devstack_localrc: - <<: *uec_image_vars devstack_local_conf: test-config: $TEMPEST_CONFIG: @@ -330,7 +326,6 @@ resize: false cold_migration: false devstack_localrc: - <<: *uec_image_vars NOVA_BACKEND: LVM # Do not waste time clearing volumes. LVM_VOLUME_CLEAR: none @@ -589,7 +584,6 @@ tox_envlist: all tempest_test_regex: api.*compute devstack_localrc: - <<: *uec_image_vars TEMPEST_COMPUTE_TYPE: compute_legacy - job: @@ -615,8 +609,6 @@ "legacy-grenade-dsvm-neutron-multinode-live-migration". irrelevant-files: *nova-base-irrelevant-files vars: - devstack_localrc: - <<: *uec_image_vars devstack_local_conf: test-config: $TEMPEST_CONFIG: @@ -663,7 +655,6 @@ # Disable other non-essential services that we don't need for this job. c-bak: false devstack_localrc: - <<: *uec_image_vars # Setup two non-cell0 cells (cell1 and cell2). NOVA_NUM_CELLS: 2 # Disable resize to the same host so all resizes will move across @@ -676,7 +667,6 @@ group-vars: peers: devstack_localrc: - <<: *uec_image_vars NOVA_ALLOW_MOVE_TO_SAME_HOST: true LIVE_MIGRATION_AVAILABLE: false subnode: @@ -705,8 +695,6 @@ 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 @@ -729,7 +717,6 @@ # will refuse because we set never_download_image_if_on_rbd in this job. # Just skip these tests for this case. devstack_localrc: - <<: *uec_image_vars GLANCE_STANDALONE: True GLANCE_USE_IMPORT_WORKFLOW: True DEVSTACK_PARALLEL: True @@ -818,7 +805,6 @@ - openstack/neutron-lib vars: devstack_localrc: - <<: *uec_image_vars # Enabeling the scope and new defaults for services implemented it. # NOTE (gmann): We need to keep keystone scope check disable as # services (except ironic) does not support the system scope and @@ -837,7 +823,6 @@ This job runs the Tempest tests with Nova RBAC old defaults vars: devstack_localrc: - <<: *uec_image_vars NOVA_ENFORCE_SCOPE: false - project: @@ -858,9 +843,6 @@ - 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: @@ -869,9 +851,6 @@ # 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 @@ -890,42 +869,24 @@ # common jobs will be enough along with nova functional # and unit tests. 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 - 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 @@ -943,105 +904,54 @@ # 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 - 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 - ironic-tempest-ipa-wholedisk-direct-tinyipa-multinode-shard - - tempest-centos9-stream-fips: - vars: - devstack_localrc: - <<: *uec_image_vars + - tempest-centos9-stream-fips experimental: jobs: - ironic-tempest-bfv: irrelevant-files: *nova-base-irrelevant-files - vars: - devstack_localrc: - <<: *uec_image_vars - ironic-tempest-ipa-wholedisk-direct-tinyipa-multinode-shard: 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