diff --git a/zuul.d/jobs.yaml b/zuul.d/jobs.yaml index 605f7a5..7617241 100644 --- a/zuul.d/jobs.yaml +++ b/zuul.d/jobs.yaml @@ -27,11 +27,11 @@ LOG_COLOR: false NETWORK_API_EXTENSIONS: >- address-scope,agent,allowed-address-pairs,auto-allocated-topology, - availability_zone,binding,default-subnetpools,dhcp_agent_scheduler, + availability_zone,binding,default-subnetpools, dns-domain-ports,dns-integration,dvr,empty-string-filtering, ext-gw-mode,external-net,extra_dhcp_opt,extraroute,filter-validation, fip-port-details,flavors,ip-substring-filtering,l3-flavors,l3-ha, - l3_agent_scheduler,logging,metering,multi-provider,net-mtu, + logging,metering,multi-provider,net-mtu, net-mtu-writable,network-ip-availability,network_availability_zone, pagination,port-security,project-id,provider,qos, qos-bw-minimum-ingress,qos-fip,quotas,quota_details,rbac-policies, @@ -92,6 +92,10 @@ ipv6_dns_nameservers: [] zuul_copy_output: '{{ stage_dir }}/stackviz': logs + "{{ devstack_base_dir }}/data/ovn": "logs" + "{{ devstack_base_dir }}/data/ovs": "logs" + "{{ devstack_log_dir }}/ovsdb-server-nb.log": "logs" + "{{ devstack_log_dir }}/ovsdb-server-sb.log": "logs" extensions_to_txt: conf: true log: true @@ -150,10 +154,44 @@ devstack_localrc: ENABLE_FILE_INJECTION: true MULTI_HOST: 1 + # NOTE(slaweq): remove those lines when switching to the default + # (ML2/OVN) backend in Neutron + Q_AGENT: openvswitch + Q_ML2_TENANT_NETWORK_TYPE: vxlan + Q_ML2_PLUGIN_MECHANISM_DRIVERS: openvswitch + devstack_local_conf: + post-config: + /$NEUTRON_CORE_PLUGIN_CONF: + AGENT: + tunnel_types: gre,vxlan devstack_services: n-cpu: false + neutron-qos: true + # Disable OVN services + # It's temporary workaround until test + # OvnControllerTest::test_restart_ovn_controller test + # will be fixed in multinode job running on the OVN backend + ovn-controller: false + ovn-northd: false + ovs-vswitchd: false + ovsdb-server: false + q-ovn-metadata-agent: false + # Neutron services + q-agt: true + q-dhcp: true + q-l3: true + q-meta: true group-vars: subnode: + devstack_localrc: + # NOTE(slaweq): remove those lines when switching to the default + # (ML2/OVN) backend in Neutron + Q_AGENT: openvswitch + devstack_local_conf: + post-config: + /$NEUTRON_CORE_PLUGIN_CONF: + AGENT: + tunnel_types: gre,vxlan devstack_services: c-vol: true dstat: true @@ -164,13 +202,22 @@ n-api-meta: true placement-client: true n-cpu: true - neutron-agent: true - neutron-qos: true - # see bug #1860753 (https://bugs.launchpad.net/devstack/+bug/1860753) - memory_tracker: false + # Disable OVN services + # It's temporary workaround until test + # OvnControllerTest::test_restart_ovn_controller test + # will be fixed in multinode job running on the OVN backend + ovn-controller: false + ovn-northd: false + ovs-vswitchd: false + ovsdb-server: false + q-ovn-metadata-agent: false + # Neutron services q-agt: true q-l3: true q-meta: true + neutron-qos: true + # see bug #1860753 (https://bugs.launchpad.net/devstack/+bug/1860753) + memory_tracker: false tls-proxy: false diff --git a/zuul.d/octavia.yaml b/zuul.d/octavia.yaml index db6c2fb..fde1f25 100644 --- a/zuul.d/octavia.yaml +++ b/zuul.d/octavia.yaml @@ -15,7 +15,24 @@ devstack_plugins: barbican: https://opendev.org/openstack/barbican.git octavia: https://opendev.org/openstack/octavia.git + devstack_localrc: + Q_AGENT: openvswitch + Q_ML2_TENANT_NETWORK_TYPE: vxlan + Q_ML2_PLUGIN_MECHANISM_DRIVERS: openvswitch devstack_services: + # OVN services + ovn-controller: false + ovn-northd: false + ovs-vswitchd: false + ovsdb-server: false + q-ovn-metadata-agent: false + # Neutron services + q-agt: true + q-dhcp: true + q-l3: true + q-meta: true + q-metering: true + q-svc: true # Octavia octavia: true o-cw: true diff --git a/zuul.d/ovn.yaml b/zuul.d/ovn.yaml index 00542e8..85f65a1 100644 --- a/zuul.d/ovn.yaml +++ b/zuul.d/ovn.yaml @@ -1,57 +1,58 @@ --- - job: - name: devstack-tobiko-ovn + name: devstack-tobiko-ovs parent: devstack-tobiko abstract: true description: | - Base Tobiko devstack job to be used with OVN. - vars: &ovn_base - devstack_local_conf: - post-config: - "/$NEUTRON_CORE_PLUGIN_CONF": - ovn: - enable_distributed_floating_ip: true + Base Tobiko devstack job to be used with ML2/OVS. + vars: &ovs_base # TODO(fressi): restore name servers list as soon external connectivity # is fixed ipv4_dns_nameservers: [] devstack_localrc: - ENABLE_CHASSIS_AS_GW: true - ENABLE_TLS: true - ML2_L3_PLUGIN: ovn-router,trunk - OVN_BUILD_MODULES: false - OVN_DBS_LOG_LEVEL: dbg - OVN_IGMP_SNOOPING_ENABLE: true - OVN_L3_CREATE_PUBLIC_NETWORK: true - PHYSICAL_NETWORK: public - Q_AGENT: ovn - Q_ML2_PLUGIN_MECHANISM_DRIVERS: ovn,logger - Q_ML2_PLUGIN_TYPE_DRIVERS: local,flat,vlan,geneve - Q_ML2_TENANT_NETWORK_TYPE: geneve - Q_USE_PROVIDERNET_FOR_PUBLIC: true + 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,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-bw-minimum-ingress,qos-fip,quotas,quota_details,rbac-policies, + router,router_availability_zone,security-group, + port-mac-address-regenerate,port-security-groups-filtering, + segment,service-type,sorting,standard-attr-description, + standard-attr-revisions,standard-attr-segment, + standard-attr-timestamp,standard-attr-tag,subnet_allocation, + trunk,trunk-details,uplink-status-propagation + Q_AGENT: openvswitch + Q_ML2_TENANT_NETWORK_TYPE: vxlan + Q_ML2_PLUGIN_MECHANISM_DRIVERS: openvswitch devstack_services: + # Disable OVN services + ovn-controller: false + ovn-northd: false + ovs-vswitchd: false + ovsdb-server: false + q-ovn-metadata-agent: false + # Neutron services + q-agt: true + q-dhcp: true + q-l3: true + q-meta: true + q-metering: true + q-port-forwarding: true + q-qos: true + neutron-segments: true br-ex-tcpdump: true br-int-flows: true c-bak: false dstat: false etcd: false - neutron-segments: true - ovn-controller: true - ovn-northd: true - ovs-vswitchd: true - ovsdb-server: true placement-api: true - q-agt: false - q-dhcp: false - q-dns: true - q-l3: false - q-meta: false - q-metering: false - q-ovn-metadata-agent: true - q-port-forwarding: true - q-qos: true - q-svc: true s-account: false s-container: false s-object: false @@ -62,21 +63,16 @@ neutron: "https://opendev.org/openstack/neutron" - job: - name: devstack-tobiko-multinode-ovn + name: devstack-tobiko-multinode-ovs parent: devstack-tobiko-multinode abstract: true description: Base DevStack Tobiko job with multinode. - vars: &ovn_multinode_vars - <<: *ovn_base + vars: &ovs_multinode_vars + <<: *ovs_base extensions_to_txt: db: true - zuul_copy_output: - "{{ devstack_base_dir }}/data/ovn": "logs" - "{{ devstack_base_dir }}/data/ovs": "logs" - "{{ devstack_log_dir }}/ovsdb-server-nb.log": "logs" - "{{ devstack_log_dir }}/ovsdb-server-sb.log": "logs" - group-vars: &ovn_multinode_group_vars + group-vars: &ovs_multinode_group_vars subnode: devstack_services: c-vol: true @@ -88,32 +84,32 @@ n-api-meta: true placement-client: true n-cpu: true - neutron-agent: false + neutron-agent: true # see bug #1860753 (https://bugs.launchpad.net/devstack/+bug/1860753) memory_tracker: false - ovn-controller: true - q-agt: false - q-l3: false - q-meta: false - q-ovn-metadata-agent: true + ovn-controller: false + q-agt: true + q-l3: true + q-meta: true + q-ovn-metadata-agent: false tls-proxy: false # --- Gate ------------------------------------------------------------------- - job: - name: devstack-tobiko-gate-ovn + name: devstack-tobiko-gate-ovs parent: devstack-tobiko-gate description: | - Tobiko devstack job used to gate with OVN + Tobiko devstack job used to gate with OVS voting: true vars: - <<: *ovn_base + <<: *ovs_base - job: - name: devstack-tobiko-gate-ovn-centos - parent: devstack-tobiko-gate-ovn + name: devstack-tobiko-gate-ovs-centos + parent: devstack-tobiko-gate-ovs nodeset: devstack-tobiko-centos voting: false @@ -121,17 +117,17 @@ # --- Faults ----------------------------------------------------------------- - job: - name: devstack-tobiko-faults-ovn + name: devstack-tobiko-faults-ovs parent: devstack-tobiko-faults abstract: true vars: - <<: *ovn_multinode_vars + <<: *ovs_multinode_vars group-vars: - <<: *ovn_multinode_group_vars + <<: *ovs_multinode_group_vars - job: - name: devstack-tobiko-faults-ovn-centos - parent: devstack-tobiko-faults-ovn + name: devstack-tobiko-faults-ovs-centos + parent: devstack-tobiko-faults-ovs nodeset: devstack-tobiko-multinode-centos voting: false diff --git a/zuul.d/project-templates.yaml b/zuul.d/project-templates.yaml index 3aeb3bf..26ce60f 100644 --- a/zuul.d/project-templates.yaml +++ b/zuul.d/project-templates.yaml @@ -11,7 +11,7 @@ - devstack-tobiko-gate-ceph - devstack-tobiko-gate-multinode - devstack-tobiko-gate-octavia - - devstack-tobiko-gate-ovn + - devstack-tobiko-gate-ovs gate: *gate_check_pipeline diff --git a/zuul.d/project.yaml b/zuul.d/project.yaml index 6fa9d5a..52eb72d 100644 --- a/zuul.d/project.yaml +++ b/zuul.d/project.yaml @@ -12,8 +12,8 @@ - devstack-tobiko-gate-centos - devstack-tobiko-gate-octavia-centos - devstack-tobiko-gate-ceph-centos - - devstack-tobiko-gate-ovn-centos + - devstack-tobiko-gate-ovs-centos - devstack-tobiko-faults-centos - - devstack-tobiko-faults-ovn-centos + - devstack-tobiko-faults-ovs-centos periodic: *check_pipeline