From b8fbe0cc2a9f32fa899dea0034391db61d499d9a Mon Sep 17 00:00:00 2001 From: Hongbin Lu Date: Thu, 22 Nov 2018 21:31:59 +0000 Subject: [PATCH] Turn the list of extensions into multi-line The intent is to avoid potential merge conflicts and improve readability. In addition, it might improve the history searching on using tool like "git blame". Change-Id: I7479cf7272887d61a32896f410dfb9e05aeac8e5 --- .zuul.yaml | 199 +++++++++++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 186 insertions(+), 13 deletions(-) diff --git a/.zuul.yaml b/.zuul.yaml index 94246842..1ba0f681 100644 --- a/.zuul.yaml +++ b/.zuul.yaml @@ -14,10 +14,70 @@ vars: tempest_concurrency: 4 tox_envlist: all + network_api_extensions_common: &api_extensions_master + - address-scope + - agent + - allowed-address-pairs + - auto-allocated-topology + - availability_zone + - binding + - default-subnetpools + - dhcp_agent_scheduler + - dns-domain-ports + - dns-integration + - empty-string-filtering + - ext-gw-mode + - external-net + - extra_dhcp_opt + - extraroute + - filter-validation + - fip-port-details + - flavors + - floatingip-pools + - ip-substring-filtering + - l3-flavors + - l3-ha + - l3_agent_scheduler + - logging + - metering + - multi-provider + - net-mtu + - net-mtu-writable + - network-ip-availability + - network_availability_zone + - pagination + - port-mac-address-regenerate + - port-security + - port-security-groups-filtering + - project-id + - provider + - qos + - qos-bw-minimum-ingress + - qos-fip + - quotas + - quota_details + - rbac-policies + - router + - router_availability_zone + - security-group + - segment + - service-type + - sorting + - standard-attr-description + - standard-attr-revisions + - standard-attr-segment + - standard-attr-tag + - standard-attr-timestamp + - subnet_allocation + - trunk + - trunk-details + - uplink-status-propagation + network_api_extensions_tempest: + - dvr devstack_localrc: USE_PYTHON3: true TEMPEST_PLUGINS: /opt/stack/neutron-tempest-plugin - NETWORK_API_EXTENSIONS: address-scope,agent,allowed-address-pairs,auto-allocated-topology,availability_zone,binding,default-subnetpools,dhcp_agent_scheduler,dns-domain-ports,dns-integration,dvr,empty-string-filtering,ext-gw-mode,external-net,extra_dhcp_opt,extraroute,filter-validation,fip-port-details,flavors,floatingip-pools,ip-substring-filtering,l3-flavors,l3-ha,l3_agent_scheduler,logging,metering,multi-provider,net-mtu,net-mtu-writable,network-ip-availability,network_availability_zone,pagination,port-mac-address-regenerate,port-security,port-security-groups-filtering,project-id,provider,qos,qos-bw-minimum-ingress,qos-fip,quotas,quota_details,rbac-policies,router,router_availability_zone,security-group,segment,service-type,sorting,standard-attr-description,standard-attr-revisions,standard-attr-segment,standard-attr-tag,standard-attr-timestamp,subnet_allocation,trunk,trunk-details,uplink-status-propagation + NETWORK_API_EXTENSIONS: "{{ (network_api_extensions_common + network_api_extensions_tempest) | join(',') }}" devstack_plugins: neutron: git://git.openstack.org/openstack/neutron.git neutron-tempest-plugin: git://git.openstack.org/openstack/neutron-tempest-plugin.git @@ -102,12 +162,63 @@ override-checkout: stable/queens vars: branch_override: stable/queens + # TODO(slaweq): find a way to put this list of extensions in + # neutron repository and keep it different per branch, + # then it could be removed from here + network_api_extensions_common: &api_extensions_queens + - address-scope + - agent + - allowed-address-pairs + - auto-allocated-topology + - availability_zone + - binding + - default-subnetpools + - dhcp_agent_scheduler + - dns-domain-ports + - dns-integration + - ext-gw-mode + - external-net + - extra_dhcp_opt + - extraroute + - flavors + - ip-substring-filtering + - l3-flavors + - l3-ha + - l3_agent_scheduler + - logging + - metering + - multi-provider + - net-mtu + - net-mtu-writable + - network-ip-availability + - network_availability_zone + - pagination + - port-security + - project-id + - provider + - qos + - qos-fip + - quotas + - quota_details + - rbac-policies + - router + - router_availability_zone + - security-group + - segment + - service-type + - sorting + - standard-attr-description + - standard-attr-revisions + - standard-attr-timestamp + - standard-attr-tag + - subnet_allocation + - trunk + - trunk-details + network_api_extensions_tempest: + - dvr devstack_localrc: USE_PYTHON3: false - # TODO(slaweq): find a way to put this list of extensions in - # neutron repository and keep it different per branch, - # then it could be removed from here - NETWORK_API_EXTENSIONS: address-scope,agent,allowed-address-pairs,auto-allocated-topology,availability_zone,binding,default-subnetpools,dhcp_agent_scheduler,dns-domain-ports,dns-integration,dvr,ext-gw-mode,external-net,extra_dhcp_opt,extraroute,flavors,ip-substring-filtering,l3-flavors,l3-ha,l3_agent_scheduler,logging,metering,multi-provider,net-mtu,net-mtu-writable,network-ip-availability,network_availability_zone,pagination,port-security,project-id,provider,qos,qos-fip,quotas,quota_details,rbac-policies,router,router_availability_zone,security-group,segment,service-type,sorting,standard-attr-description,standard-attr-revisions,standard-attr-timestamp,standard-attr-tag,subnet_allocation,trunk,trunk-details + NETWORK_API_EXTENSIONS: "{{ (network_api_extensions_common + network_api_extensions_tempest) | join(',') }}" - job: name: neutron-tempest-plugin-api-rocky @@ -115,12 +226,68 @@ override-checkout: stable/rocky vars: branch_override: stable/rocky + # TODO(slaweq): find a way to put this list of extensions in + # neutron repository and keep it different per branch, + # then it could be removed from here + network_api_extensions_common: &api_extensions_rocky + - address-scope + - agent + - allowed-address-pairs + - auto-allocated-topology + - availability_zone + - binding + - default-subnetpools + - dhcp_agent_scheduler + - dns-domain-ports + - dns-integration + - empty-string-filtering + - ext-gw-mode + - external-net + - extra_dhcp_opt + - extraroute + - fip-port-details + - flavors + - ip-substring-filtering + - l3-flavors + - l3-ha + - l3_agent_scheduler + - logging + - metering + - multi-provider + - net-mtu + - net-mtu-writable + - network-ip-availability + - network_availability_zone + - pagination + - port-mac-address-regenerate + - port-security + - port-security-groups-filtering + - project-id + - provider + - qos + - qos-fip + - quotas + - quota_details + - rbac-policies + - router + - router_availability_zone + - security-group + - segment + - service-type + - sorting + - standard-attr-description + - standard-attr-revisions + - standard-attr-segment + - standard-attr-timestamp + - standard-attr-tag + - subnet_allocation + - trunk + - trunk-details + network_api_extensions_tempest: + - dvr devstack_localrc: USE_PYTHON3: false - # TODO(slaweq): find a way to put this list of extensions in - # neutron repository and keep it different per branch, - # then it could be removed from here - NETWORK_API_EXTENSIONS: address-scope,agent,allowed-address-pairs,auto-allocated-topology,availability_zone,binding,default-subnetpools,dhcp_agent_scheduler,dns-domain-ports,dns-integration,dvr,empty-string-filtering,ext-gw-mode,external-net,extra_dhcp_opt,extraroute,fip-port-details,flavors,ip-substring-filtering,l3-flavors,l3-ha,l3_agent_scheduler,logging,metering,multi-provider,net-mtu,net-mtu-writable,network-ip-availability,network_availability_zone,pagination,port-mac-address-regenerate,port-security,port-security-groups-filtering,project-id,provider,qos,qos-fip,quotas,quota_details,rbac-policies,router,router_availability_zone,security-group,segment,service-type,sorting,standard-attr-description,standard-attr-revisions,standard-attr-segment,standard-attr-timestamp,standard-attr-tag,subnet_allocation,trunk,trunk-details + NETWORK_API_EXTENSIONS: "{{ (network_api_extensions_common + network_api_extensions_tempest) | join(',') }}" - job: name: neutron-tempest-plugin-scenario @@ -147,9 +314,10 @@ parent: neutron-tempest-plugin-scenario timeout: 10000 vars: + network_api_extensions: *api_extensions_master devstack_localrc: Q_AGENT: linuxbridge - NETWORK_API_EXTENSIONS: address-scope,agent,allowed-address-pairs,auto-allocated-topology,availability_zone,binding,default-subnetpools,dhcp_agent_scheduler,dns-domain-ports,dns-integration,empty-string-filtering,ext-gw-mode,external-net,extra_dhcp_opt,extraroute,filter-validation,fip-port-details,flavors,floatingip-pools,ip-substring-filtering,l3-flavors,l3-ha,l3_agent_scheduler,logging,metering,multi-provider,net-mtu,net-mtu-writable,network-ip-availability,network_availability_zone,pagination,port-mac-address-regenerate,port-security,port-security-groups-filtering,project-id,provider,qos,qos-bw-minimum-ingress,qos-fip,quotas,quota_details,rbac-policies,router,router_availability_zone,security-group,segment,service-type,sorting,standard-attr-description,standard-attr-revisions,standard-attr-segment,standard-attr-tag,standard-attr-timestamp,subnet_allocation,trunk,trunk-details,uplink-status-propagation + NETWORK_API_EXTENSIONS: "{{ network_api_extensions | join(',') }}" devstack_local_conf: post-config: $NEUTRON_CONF: @@ -175,9 +343,10 @@ override-checkout: stable/queens vars: branch_override: stable/queens + network_api_extensions: *api_extensions_queens devstack_localrc: USE_PYTHON3: false - NETWORK_API_EXTENSIONS: address-scope,agent,allowed-address-pairs,auto-allocated-topology,availability_zone,binding,default-subnetpools,dhcp_agent_scheduler,dns-domain-ports,dns-integration,ext-gw-mode,external-net,extra_dhcp_opt,extraroute,flavors,ip-substring-filtering,l3-flavors,l3-ha,l3_agent_scheduler,logging,metering,multi-provider,net-mtu,net-mtu-writable,network-ip-availability,network_availability_zone,pagination,port-security,project-id,provider,qos,qos-fip,quotas,quota_details,rbac-policies,router,router_availability_zone,security-group,segment,service-type,sorting,standard-attr-description,standard-attr-revisions,standard-attr-timestamp,standard-attr-tag,subnet_allocation,trunk,trunk-details + NETWORK_API_EXTENSIONS: "{{ network_api_extensions | join(',') }}" devstack_local_conf: test-config: # NOTE: ignores linux bridge's trunk delete on bound port test @@ -193,9 +362,10 @@ override-checkout: stable/rocky vars: branch_override: stable/rocky + network_api_extensions: *api_extensions_rocky devstack_localrc: USE_PYTHON3: false - NETWORK_API_EXTENSIONS: address-scope,agent,allowed-address-pairs,auto-allocated-topology,availability_zone,binding,default-subnetpools,dhcp_agent_scheduler,dns-domain-ports,dns-integration,empty-string-filtering,ext-gw-mode,external-net,extra_dhcp_opt,extraroute,fip-port-details,flavors,ip-substring-filtering,l3-flavors,l3-ha,l3_agent_scheduler,logging,metering,multi-provider,net-mtu,net-mtu-writable,network-ip-availability,network_availability_zone,pagination,port-mac-address-regenerate,port-security,port-security-groups-filtering,project-id,provider,qos,qos-fip,quotas,quota_details,rbac-policies,router,router_availability_zone,security-group,segment,service-type,sorting,standard-attr-description,standard-attr-revisions,standard-attr-segment,standard-attr-timestamp,standard-attr-tag,subnet_allocation,trunk,trunk-details + NETWORK_API_EXTENSIONS: "{{ network_api_extensions | join(',') }}" devstack_local_conf: test-config: # NOTE: ignores linux bridge's trunk delete on bound port test @@ -223,10 +393,13 @@ tempest_concurrency: 4 tox_envlist: all tempest_test_regex: ^neutron_tempest_plugin\.scenario + network_api_extensions_common: *api_extensions_master + network_api_extensions_dvr: + - dvr devstack_localrc: USE_PYTHON3: true TEMPEST_PLUGINS: /opt/stack/neutron-tempest-plugin - NETWORK_API_EXTENSIONS: "address-scope,agent,allowed-address-pairs,auto-allocated-topology,availability_zone,binding,default-subnetpools,dhcp_agent_scheduler,dns-domain-ports,dns-integration,dvr,empty-string-filtering,ext-gw-mode,external-net,extra_dhcp_opt,extraroute,filter-validation,fip-port-details,flavors,floatingip-pools,ip-substring-filtering,l3-flavors,l3-ha,l3_agent_scheduler,logging,metering,multi-provider,net-mtu,net-mtu-writable,network-ip-availability,network_availability_zone,pagination,port-mac-address-regenerate,port-security,port-security-groups-filtering,project-id,provider,qos,qos-bw-minimum-ingress,qos-fip,quotas,quota_details,rbac-policies,router,router_availability_zone,security-group,segment,service-type,sorting,standard-attr-description,standard-attr-revisions,standard-attr-segment,standard-attr-tag,standard-attr-timestamp,subnet_allocation,trunk,trunk-details,uplink-status-propagation" + NETWORK_API_EXTENSIONS: "{{ (network_api_extensions_common + network_api_extensions_dvr) | join(',') }}" PHYSICAL_NETWORK: default DOWNLOAD_DEFAULT_IMAGES: false IMAGE_URLS: "http://download.cirros-cloud.net/0.3.4/cirros-0.3.4-i386-disk.img,http://cloud-images.ubuntu.com/releases/16.04/release-20180622/ubuntu-16.04-server-cloudimg-amd64-disk1.img"