Merge "Use infra mirrors for advanced image prepare"
diff --git a/neutron_tempest_plugin/api/test_subnets.py b/neutron_tempest_plugin/api/test_subnets.py
index 23574ee..126dc70 100644
--- a/neutron_tempest_plugin/api/test_subnets.py
+++ b/neutron_tempest_plugin/api/test_subnets.py
@@ -24,6 +24,8 @@
@classmethod
def resource_setup(cls):
+ if 'subnet-external-network' in cls.get_loaded_network_extensions():
+ cls.list_kwargs['router:external'] = False
super(SubnetsSearchCriteriaTest, cls).resource_setup()
net = cls.create_network(network_name='subnet-search-test-net')
for name in cls.resource_names:
@@ -67,8 +69,6 @@
@decorators.idempotent_id('c0f9280b-9d81-4728-a967-6be22659d4c8')
def test_list_validation_filters(self):
- if 'subnet-external-network' in self.get_loaded_network_extensions():
- self.list_kwargs['router:external'] = False
self._test_list_validation_filters(self.list_kwargs)
self._test_list_validation_filters({
'unknown_filter': 'value'}, filter_is_valid=False)
diff --git a/releasenotes/notes/advance-image-ubuntu-jammy-2204-11b5ee414d665b66.yaml b/releasenotes/notes/advance-image-ubuntu-jammy-2204-11b5ee414d665b66.yaml
new file mode 100644
index 0000000..49d7652
--- /dev/null
+++ b/releasenotes/notes/advance-image-ubuntu-jammy-2204-11b5ee414d665b66.yaml
@@ -0,0 +1,5 @@
+---
+other:
+ - |
+ The testing advanced image used in some jobs has been bumped from Ubuntu
+ Focal 20.04 to Ubuntu Jammy 22.04.
diff --git a/zuul.d/2023_2_jobs.yaml b/zuul.d/2023_2_jobs.yaml
deleted file mode 100644
index 2261b7c..0000000
--- a/zuul.d/2023_2_jobs.yaml
+++ /dev/null
@@ -1,306 +0,0 @@
-- job:
- name: neutron-tempest-plugin-openvswitch-2023-2
- parent: neutron-tempest-plugin-openvswitch
- nodeset: neutron-nested-virt-ubuntu-jammy
- override-checkout: stable/2023.2
- vars:
- network_api_extensions_openvswitch: &api_extensions_openvswitch
- - dhcp_agent_scheduler
- - local_ip
- - qos-bw-minimum-ingress
- tempest_test_regex: "\
- (^neutron_tempest_plugin.api)|\
- (^neutron_tempest_plugin.scenario)|\
- (^tempest.api.compute.servers.test_attach_interfaces)|\
- (^tempest.api.compute.servers.test_multiple_create)"
- network_available_features: &available_features
- - ipv6_metadata
- network_api_extensions_common: &api_extensions
- - address-group
- - address-scope
- - agent
- - allowed-address-pairs
- - auto-allocated-topology
- - availability_zone
- - binding
- - default-subnetpools
- - dns-domain-ports
- - dns-integration
- - dns-integration-domain-keywords
- - empty-string-filtering
- - expose-port-forwarding-in-fip
- - expose-l3-conntrack-helper
- - ext-gw-mode
- - external-net
- - extra_dhcp_opt
- - extraroute
- - extraroute-atomic
- - filter-validation
- - fip-port-details
- - flavors
- - floating-ip-port-forwarding
- - floating-ip-port-forwarding-detail
- - floatingip-pools
- - ip-substring-filtering
- - l3-conntrack-helper
- - l3-ext-ndp-proxy
- - l3-flavors
- - l3-ha
- - l3-ndp-proxy
- - l3_agent_scheduler
- - metering
- - multi-provider
- - net-mtu
- - net-mtu-writable
- - network-ip-availability
- - network_availability_zone
- - network-segment-range
- - pagination
- - port-device-profile
- - port-mac-address-regenerate
- - port-resource-request
- - port-resource-request-groups
- - port-security
- - port-security-groups-filtering
- - project-id
- - provider
- - qos
- - qos-fip
- - quotas
- - quota_details
- - rbac-address-group
- - rbac-address-scope
- - rbac-policies
- - rbac-security-groups
- - rbac-subnetpool
- - router
- - router_availability_zone
- - security-group
- - security-groups-remote-address-group
- - segment
- - service-type
- - sorting
- - standard-attr-description
- - standard-attr-revisions
- - standard-attr-segment
- - standard-attr-tag
- - standard-attr-timestamp
- - stateful-security-group
- - subnet_allocation
- - subnet-dns-publish-fixed-ip
- - subnet-service-types
- - subnetpool-prefix-ops
- - tag-ports-during-bulk-creation
- - trunk
- - trunk-details
- - uplink-status-propagation
- devstack_localrc:
- NETWORK_API_EXTENSIONS: "{{ (network_api_extensions_common + network_api_extensions_openvswitch) | join(',') }}"
- NEUTRON_DEPLOY_MOD_WSGI: false
- devstack_local_conf:
- test-config:
- $TEMPEST_CONFIG:
- network-feature-enabled:
- available_features: "{{ network_available_features | join(',') }}"
-
-- job:
- name: neutron-tempest-plugin-openvswitch-iptables_hybrid-2023-2
- parent: neutron-tempest-plugin-openvswitch-iptables_hybrid
- nodeset: neutron-nested-virt-ubuntu-jammy
- override-checkout: stable/2023.2
- vars:
- network_api_extensions_common: *api_extensions
- network_api_extensions_openvswitch: *api_extensions_openvswitch
- network_available_features: *available_features
- tempest_test_regex: "\
- (^neutron_tempest_plugin.api)|\
- (^neutron_tempest_plugin.scenario)|\
- (^tempest.api.compute.servers.test_attach_interfaces)|\
- (^tempest.api.compute.servers.test_multiple_create)"
- # TODO(slaweq): remove trunks subport_connectivity test from blacklist
- # when bug https://bugs.launchpad.net/neutron/+bug/1838760 will be fixed
- # TODO(akatz): remove established tcp session verification test when the
- # bug https://bugzilla.redhat.com/show_bug.cgi?id=1965036 will be fixed
- tempest_exclude_regex: "\
- (^neutron_tempest_plugin.scenario.test_trunk.TrunkTest.test_subport_connectivity)|\
- (^neutron_tempest_plugin.scenario.test_security_groups.StatefulNetworkSecGroupTest.test_established_tcp_session_after_re_attachinging_sg)|\
- (^neutron_tempest_plugin.scenario.test_security_groups.StatelessNetworkSecGroupTest.test_established_tcp_session_after_re_attachinging_sg)"
- devstack_localrc:
- NETWORK_API_EXTENSIONS: "{{ (network_api_extensions_common + network_api_extensions_openvswitch) | join(',') }}"
- NEUTRON_DEPLOY_MOD_WSGI: false
- devstack_local_conf:
- test-config:
- $TEMPEST_CONFIG:
- network-feature-enabled:
- available_features: "{{ network_available_features | join(',') }}"
- neutron_plugin_options:
- available_type_drivers: flat,vlan,local,vxlan
- firewall_driver: iptables_hybrid
-
-- job:
- name: neutron-tempest-plugin-openvswitch-enforce-scope-new-defaults-2023-2
- parent: neutron-tempest-plugin-openvswitch-2023-2
- nodeset: neutron-nested-virt-ubuntu-jammy
- override-checkout: stable/2023.2
- vars:
- devstack_localrc:
- # Enabeling the scope and new defaults for services.
- # NOTE: (gmann) We need to keep keystone scope check disable as
- # services (except ironic) does not support the system scope and
- # they need keystone to continue working with project scope. Until
- # Keystone policies are changed to work for both system as well as
- # for project scoped, we need to keep scope check disable for
- # keystone.
- NOVA_ENFORCE_SCOPE: true
- GLANCE_ENFORCE_SCOPE: true
- NEUTRON_ENFORCE_SCOPE: true
-
-- job:
- name: neutron-tempest-plugin-linuxbridge-2023-2
- parent: neutron-tempest-plugin-linuxbridge
- nodeset: neutron-nested-virt-ubuntu-jammy
- override-checkout: stable/2023.2
- vars:
- network_api_extensions_common: *api_extensions
- network_api_extensions_linuxbridge:
- - dhcp_agent_scheduler
- - vlan-transparent
- network_available_features: *available_features
- tempest_test_regex: "\
- (^neutron_tempest_plugin.api)|\
- (^neutron_tempest_plugin.scenario)|\
- (^tempest.api.compute.servers.test_attach_interfaces)|\
- (^tempest.api.compute.servers.test_multiple_create)"
- # TODO(eolivare): remove VLAN Transparency tests from blacklist
- # when bug https://bugs.launchpad.net/neutron/+bug/1907548 will be fixed
- # TODO(slaweq): remove
- # test_established_tcp_session_after_re_attachinging_sg from the
- # exclude regex when bug https://bugs.launchpad.net/neutron/+bug/1936911
- # will be fixed
- # TODO(slaweq) remove test_floatingip_port_details from the exclude
- # regex when bug https://bugs.launchpad.net/neutron/+bug/1799790 will be
- # fixed
- tempest_exclude_regex: "\
- (^neutron_tempest_plugin.scenario.test_vlan_transparency.VlanTransparencyTest)|\
- (^neutron_tempest_plugin.scenario.test_security_groups.StatefulNetworkSecGroupTest.test_established_tcp_session_after_re_attachinging_sg)|\
- (^neutron_tempest_plugin.scenario.test_security_groups.StatelessNetworkSecGroupTest.test_established_tcp_session_after_re_attachinging_sg)|\
- (^neutron_tempest_plugin.scenario.test_floatingip.FloatingIPPortDetailsTest.test_floatingip_port_details)"
- devstack_localrc:
- NETWORK_API_EXTENSIONS: "{{ (network_api_extensions_common + network_api_extensions_linuxbridge) | join(',') }}"
- NEUTRON_DEPLOY_MOD_WSGI: false
- devstack_local_conf:
- test-config:
- $TEMPEST_CONFIG:
- network-feature-enabled:
- available_features: "{{ network_available_features | join(',') }}"
- neutron_plugin_options:
- available_type_drivers: flat,vlan,local,vxlan
- q_agent: linuxbridge
- firewall_driver: iptables
-
-- job:
- name: neutron-tempest-plugin-ovn-2023-2
- parent: neutron-tempest-plugin-ovn
- nodeset: neutron-nested-virt-ubuntu-jammy
- override-checkout: stable/2023.2
- vars:
- network_api_extensions_ovn:
- - vlan-transparent
- tempest_test_regex: "\
- (^neutron_tempest_plugin.api)|\
- (^neutron_tempest_plugin.scenario)|\
- (^tempest.api.compute.servers.test_attach_interfaces)|\
- (^tempest.api.compute.servers.test_multiple_create)"
- devstack_localrc:
- NETWORK_API_EXTENSIONS: "{{ (network_api_extensions_common + network_api_extensions_ovn) | join(',') }}"
- NEUTRON_DEPLOY_MOD_WSGI: false
- devstack_services:
- q-ovn-metadata-agent: true
- q-ovn-agent: false
- devstack_local_conf:
- test-config:
- $TEMPEST_CONFIG:
- network-feature-enabled:
- available_features: ""
- neutron_plugin_options:
- available_type_drivers: local,flat,vlan,geneve
- is_igmp_snooping_enabled: True
- firewall_driver: ovn
-
-- job:
- name: neutron-tempest-plugin-dvr-multinode-scenario-2023-2
- parent: neutron-tempest-plugin-dvr-multinode-scenario
- nodeset: openstack-two-node-jammy
- override-checkout: stable/2023.2
- vars:
- network_api_extensions_common: *api_extensions
- network_api_extensions_dvr:
- - dhcp_agent_scheduler
- - dvr
- devstack_localrc:
- NETWORK_API_EXTENSIONS: "{{ (network_api_extensions_common + network_api_extensions_dvr) | join(',') }}"
- NEUTRON_DEPLOY_MOD_WSGI: false
-
-- job:
- name: neutron-tempest-plugin-designate-scenario-2023-2
- parent: neutron-tempest-plugin-designate-scenario
- nodeset: neutron-nested-virt-ubuntu-jammy
- override-checkout: stable/2023.2
- vars:
- network_api_extensions_common: *api_extensions
- devstack_localrc:
- NEUTRON_DEPLOY_MOD_WSGI: false
-
-- job:
- name: neutron-tempest-plugin-sfc-2023-2
- parent: neutron-tempest-plugin-sfc
- nodeset: openstack-single-node-jammy
- override-checkout: stable/2023.2
- vars:
- devstack_localrc:
- NEUTRON_DEPLOY_MOD_WSGI: false
-
-- job:
- name: neutron-tempest-plugin-bgpvpn-bagpipe-2023-2
- parent: neutron-tempest-plugin-bgpvpn-bagpipe
- nodeset: openstack-single-node-jammy
- override-checkout: stable/2023.2
- vars:
- devstack_localrc:
- NEUTRON_DEPLOY_MOD_WSGI: false
-
-- job:
- name: neutron-tempest-plugin-dynamic-routing-2023-2
- parent: neutron-tempest-plugin-dynamic-routing
- nodeset: openstack-single-node-jammy
- override-checkout: stable/2023.2
- vars:
- devstack_localrc:
- NEUTRON_DEPLOY_MOD_WSGI: false
-
-- job:
- name: neutron-tempest-plugin-fwaas-2023-2
- parent: neutron-tempest-plugin-fwaas-openvswitch
- nodeset: openstack-single-node-jammy
- override-checkout: stable/2023.2
- vars:
- devstack_localrc:
- NEUTRON_DEPLOY_MOD_WSGI: false
-
-- job:
- name: neutron-tempest-plugin-vpnaas-2023-2
- parent: neutron-tempest-plugin-vpnaas
- nodeset: openstack-single-node-jammy
- override-checkout: stable/2023.2
- vars:
- devstack_localrc:
- NEUTRON_DEPLOY_MOD_WSGI: false
-
-- job:
- name: neutron-tempest-plugin-tap-as-a-service-2023-2
- parent: neutron-tempest-plugin-tap-as-a-service
- nodeset: openstack-single-node-jammy
- override-checkout: stable/2023.2
- vars:
- devstack_localrc:
- NEUTRON_DEPLOY_MOD_WSGI: false
diff --git a/zuul.d/master_jobs.yaml b/zuul.d/master_jobs.yaml
index 3d4f0e9..d4c82ff 100644
--- a/zuul.d/master_jobs.yaml
+++ b/zuul.d/master_jobs.yaml
@@ -26,11 +26,11 @@
USE_PYTHON3: true
NETWORK_API_EXTENSIONS: "{{ (network_api_extensions_common + network_api_extensions_tempest) | join(',') }}"
PHYSICAL_NETWORK: public
- IMAGE_URLS: https://cloud-images.ubuntu.com/minimal/releases/focal/release/ubuntu-20.04-minimal-cloudimg-amd64.img
+ IMAGE_URLS: https://cloud-images.ubuntu.com/minimal/releases/jammy/release/ubuntu-22.04-minimal-cloudimg-amd64.img
CIRROS_VERSION: 0.6.3
DEFAULT_IMAGE_NAME: cirros-0.6.3-x86_64-uec
DEFAULT_IMAGE_FILE_NAME: cirros-0.6.3-x86_64-uec.tar.gz
- ADVANCED_IMAGE_NAME: ubuntu-20.04-minimal-cloudimg-amd64
+ ADVANCED_IMAGE_NAME: ubuntu-22.04-minimal-cloudimg-amd64
ADVANCED_INSTANCE_TYPE: ntp_image_256M
ADVANCED_INSTANCE_USER: ubuntu
CUSTOMIZE_IMAGE: true
@@ -610,6 +610,10 @@
OVN_DBS_LOG_LEVEL: dbg
ENABLE_TLS: True
OVN_IGMP_SNOOPING_ENABLE: True
+ # NOTE(ralonsoh): ubuntu-22.04-minimal is not used due to an issue with
+ # the IGMP messages. See https://bugs.launchpad.net/cloud-images/+bug/2110520
+ IMAGE_URLS: https://cloud-images.ubuntu.com/jammy/current/jammy-server-cloudimg-amd64.img
+ ADVANCED_IMAGE_NAME: jammy-server-cloudimg-amd64
devstack_services:
br-ex-tcpdump: true
br-int-flows: true
@@ -722,13 +726,6 @@
- ^zuul.d/.*_jobs\.yaml$
- ^zuul.d/base-nested-switch.yaml
-# TODO(slaweq): remove that job's definition as soon as new job
-# "neutron-tempest-plugin-ovn" will be used in the neutron-lib repo as
-# instead of old "neutron-tempest-plugin-api" job
-- job:
- name: neutron-tempest-plugin-api
- parent: neutron-tempest-plugin-ovn
-
- job: # Needed only in Neutron stable/2024.2
name: neutron-tempest-plugin-api-ovs-wsgi
parent: neutron-tempest-plugin-openvswitch
@@ -778,8 +775,8 @@
CIRROS_VERSION: 0.6.3
DEFAULT_IMAGE_NAME: cirros-0.6.3-x86_64-uec
DEFAULT_IMAGE_FILE_NAME: cirros-0.6.3-x86_64-uec.tar.gz
- IMAGE_URLS: https://cloud-images.ubuntu.com/minimal/releases/focal/release/ubuntu-20.04-minimal-cloudimg-amd64.img
- ADVANCED_IMAGE_NAME: ubuntu-20.04-minimal-cloudimg-amd64
+ IMAGE_URLS: https://cloud-images.ubuntu.com/minimal/releases/jammy/release/ubuntu-22.04-minimal-cloudimg-amd64.img
+ ADVANCED_IMAGE_NAME: ubuntu-22.04-minimal-cloudimg-amd64
ADVANCED_INSTANCE_TYPE: ntp_image_256M
ADVANCED_INSTANCE_USER: ubuntu
CUSTOMIZE_IMAGE: true
@@ -1148,6 +1145,7 @@
required-projects:
- openstack/networking-bagpipe
- openstack/networking-bgpvpn
+ timeout: 10800
vars:
devstack_services:
# Disable OVN services
@@ -1358,12 +1356,6 @@
driver: openvswitch
irrelevant-files: *fwaas_irrelevant_files
-# TODO(slaweq):
-# Remove this alias once jobs in fwaas project will be moved to the new names
-- job:
- name: neutron-tempest-plugin-fwaas
- parent: neutron-tempest-plugin-fwaas-openvswitch
-
- job:
name: neutron-tempest-plugin-vpnaas
parent: neutron-tempest-plugin-base
diff --git a/zuul.d/project.yaml b/zuul.d/project.yaml
index 9c94e3b..f9f70dd 100644
--- a/zuul.d/project.yaml
+++ b/zuul.d/project.yaml
@@ -4,8 +4,7 @@
jobs:
- neutron-tempest-plugin-openvswitch
- neutron-tempest-plugin-ovn
- - neutron-tempest-plugin-designate-scenario:
- voting: false
+ - neutron-tempest-plugin-designate-scenario
gate:
jobs:
- neutron-tempest-plugin-openvswitch
@@ -140,24 +139,6 @@
- neutron-tempest-plugin-dvr-multinode-scenario-2023-1
- project-template:
- name: neutron-tempest-plugin-jobs-2023-2
- check:
- jobs:
- - neutron-tempest-plugin-openvswitch-2023-2
- - neutron-tempest-plugin-openvswitch-iptables_hybrid-2023-2
- - neutron-tempest-plugin-ovn-2023-2
- - neutron-tempest-plugin-designate-scenario-2023-2
- gate:
- jobs:
- - neutron-tempest-plugin-ovn-2023-2
- #TODO(slaweq): Move neutron-tempest-plugin-dvr-multinode-scenario out of
- # the experimental queue when it will be more stable
- experimental:
- jobs:
- - neutron-tempest-plugin-linuxbridge-2023-2
- - neutron-tempest-plugin-dvr-multinode-scenario-2023-2
-
-- project-template:
name: neutron-tempest-plugin-jobs-2024-1
check:
jobs:
@@ -200,8 +181,7 @@
- neutron-tempest-plugin-openvswitch-2025-1
- neutron-tempest-plugin-openvswitch-iptables_hybrid-2025-1
- neutron-tempest-plugin-ovn-2025-1
- - neutron-tempest-plugin-designate-scenario-2025-1:
- voting: false
+ - neutron-tempest-plugin-designate-scenario-2025-1
- neutron-tempest-plugin-openvswitch-ubuntu-jammy-2025-1
- neutron-tempest-plugin-ovn-ubuntu-jammy-2025-1
gate:
@@ -217,7 +197,6 @@
templates:
- build-openstack-docs-pti
- neutron-tempest-plugin-jobs
- - neutron-tempest-plugin-jobs-2023-2
- neutron-tempest-plugin-jobs-2024-1
- neutron-tempest-plugin-jobs-2024-2
- neutron-tempest-plugin-jobs-2025-1
@@ -227,12 +206,10 @@
check:
jobs:
- neutron-tempest-plugin-sfc
- - neutron-tempest-plugin-sfc-2023-2
- neutron-tempest-plugin-sfc-2024-1
- neutron-tempest-plugin-sfc-2024-2
- neutron-tempest-plugin-sfc-2025-1
- neutron-tempest-plugin-bgpvpn-bagpipe
- - neutron-tempest-plugin-bgpvpn-bagpipe-2023-2
- neutron-tempest-plugin-bgpvpn-bagpipe-2024-1
- neutron-tempest-plugin-bgpvpn-bagpipe-2024-2
- neutron-tempest-plugin-bgpvpn-bagpipe-2025-1
@@ -244,24 +221,20 @@
# [1]https://review.opendev.org/c/openstack/neutron/+/941202
# [2]https://review.opendev.org/c/openstack/neutron-tempest-plugin/+/940906
voting: false
- - neutron-tempest-plugin-dynamic-routing-2023-2
- neutron-tempest-plugin-dynamic-routing-2024-1
- neutron-tempest-plugin-dynamic-routing-2024-2
- neutron-tempest-plugin-dynamic-routing-2025-1
- neutron-tempest-plugin-fwaas-ovn
- neutron-tempest-plugin-fwaas-openvswitch
- - neutron-tempest-plugin-fwaas-2023-2
- neutron-tempest-plugin-fwaas-2024-1
- neutron-tempest-plugin-fwaas-2024-2
- neutron-tempest-plugin-fwaas-2025-1
- neutron-tempest-plugin-vpnaas
- neutron-tempest-plugin-vpnaas-ovn
- - neutron-tempest-plugin-vpnaas-2023-2
- neutron-tempest-plugin-vpnaas-2024-1
- neutron-tempest-plugin-vpnaas-2024-2
- neutron-tempest-plugin-vpnaas-2025-1
- neutron-tempest-plugin-tap-as-a-service
- - neutron-tempest-plugin-tap-as-a-service-2023-2
- neutron-tempest-plugin-tap-as-a-service-2024-1
- neutron-tempest-plugin-tap-as-a-service-2024-2
- neutron-tempest-plugin-tap-as-a-service-2025-1
diff --git a/zuul.d/yoga_jobs.yaml b/zuul.d/yoga_jobs.yaml
index be6c65e..2bb33e5 100644
--- a/zuul.d/yoga_jobs.yaml
+++ b/zuul.d/yoga_jobs.yaml
@@ -6,8 +6,12 @@
required-projects: &required-projects-yoga
- openstack/neutron
- name: openstack/neutron-tempest-plugin
- override-checkout: 2.6.0
+ override-checkout: yoga-last
- openstack/tempest
+ - name: openstack/designate-tempest-plugin
+ override-checkout: yoga-last
+ - name: openstack/designate
+ override-checkout: yoga-eol
vars:
devstack_localrc:
NEUTRON_DEPLOY_MOD_WSGI: false
diff --git a/zuul.d/zed_jobs.yaml b/zuul.d/zed_jobs.yaml
index f936b8c..9ae2d87 100644
--- a/zuul.d/zed_jobs.yaml
+++ b/zuul.d/zed_jobs.yaml
@@ -225,7 +225,13 @@
name: neutron-tempest-plugin-designate-scenario-zed
parent: neutron-tempest-plugin-designate-scenario
override-checkout: unmaintained/zed
- required-projects: *required-projects-zed
+ required-projects:
+ - openstack/neutron
+ - name: openstack/neutron-tempest-plugin
+ override-checkout: zed-last
+ - openstack/tempest
+ - name: openstack/designate-tempest-plugin
+ override-checkout: zed-last
nodeset: neutron-nested-virt-ubuntu-focal
vars:
network_api_extensions_common: *api_extensions