diff --git a/.zuul.yaml b/.zuul.yaml index 420483831..516a57442 100644 --- a/.zuul.yaml +++ b/.zuul.yaml @@ -112,6 +112,11 @@ Q_ML2_PLUGIN_EXT_DRIVERS: port_security,qos L2_AGENT_EXTENSIONS: qos DEVSTACK_PARALLEL: True + # TODO(ueha): The network ML2 driver is changed to OVS to pass the FT. + # devstack has changed default to OVN and needs to be followed. + Q_AGENT: openvswitch + Q_ML2_TENANT_NETWORK_TYPE: vxlan + Q_ML2_PLUGIN_MECHANISM_DRIVERS: openvswitch,linuxbridge test_matrix_configs: [neutron] zuul_work_dir: src/opendev.org/openstack/tacker host-vars: @@ -232,12 +237,24 @@ router" Q_ML2_PLUGIN_EXT_DRIVERS: port_security,qos L2_AGENT_EXTENSIONS: qos + # TODO(ueha): The network ML2 driver is changed to OVS to pass the FT. + # devstack has changed default to OVN and needs to be followed. + Q_AGENT: openvswitch + Q_ML2_TENANT_NETWORK_TYPE: vxlan + Q_ML2_PLUGIN_MECHANISM_DRIVERS: openvswitch,linuxbridge devstack_plugins: ceilometer: https://opendev.org/openstack/ceilometer devstack_services: ceilometer-acompute: true # To override the parent job's definitions. tls-proxy: false + # TODO(ueha): The network ML2 driver is changed to OVS to pass the FT. + # devstack has changed default to OVN and needs to be followed. + q-agt: true + ovn-controller: false + ovs-vswitchd: false + ovsdb-server: false + q-ovn-metadata-agent: false - job: name: tacker-functional-devstack-multinode-sol @@ -289,7 +306,10 @@ - openstack/heat - openstack/horizon - openstack/keystone - - openstack/kuryr-kubernetes + # TODO(ueha): temporarily use stable/wallaby branch for solve FT error. + # After confirming that it works in the master branch, modify it. + - name: openstack/kuryr-kubernetes + override-branch: stable/wallaby - openstack/mistral - openstack/neutron - openstack/nova @@ -403,6 +423,11 @@ TACKER_HOST: "{{ hostvars['controller-tacker']['nodepool']['private_ipv4'] }}" TACKER_MODE: standalone USE_PYTHON3: true + # TODO(ueha): The network ML2 driver is changed to OVS to pass the FT. + # devstack has changed default to OVN and needs to be followed. + Q_AGENT: openvswitch + Q_ML2_TENANT_NETWORK_TYPE: vxlan + Q_ML2_PLUGIN_MECHANISM_DRIVERS: openvswitch,linuxbridge devstack_services: dstat: false horizon: false @@ -416,6 +441,12 @@ n-sch: false q-agt: true tls-proxy: false + # TODO(ueha): The network ML2 driver is changed to OVS to pass the FT. + # devstack has changed default to OVN and needs to be followed. + ovn-controller: false + ovs-vswitchd: false + ovsdb-server: false + q-ovn-metadata-agent: false vars: devstack_localrc: CELLSV2_SETUP: singleconductor @@ -437,6 +468,11 @@ TACKER_MODE: standalone USE_PYTHON3: true DEVSTACK_PARALLEL: True + # TODO(ueha): The network ML2 driver is changed to OVS to pass the FT. + # devstack has changed default to OVN and needs to be followed. + Q_AGENT: openvswitch + Q_ML2_TENANT_NETWORK_TYPE: vxlan + Q_ML2_PLUGIN_MECHANISM_DRIVERS: openvswitch,linuxbridge devstack_local_conf: post-config: $NEUTRON_DHCP_CONF: