Merge "Avoid FT errors caused by other projects change"

This commit is contained in:
Zuul 2021-06-04 15:24:14 +00:00 committed by Gerrit Code Review
commit 8e79746b28
1 changed files with 37 additions and 1 deletions

View File

@ -112,6 +112,11 @@
Q_ML2_PLUGIN_EXT_DRIVERS: port_security,qos Q_ML2_PLUGIN_EXT_DRIVERS: port_security,qos
L2_AGENT_EXTENSIONS: qos L2_AGENT_EXTENSIONS: qos
DEVSTACK_PARALLEL: 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
test_matrix_configs: [neutron] test_matrix_configs: [neutron]
zuul_work_dir: src/opendev.org/openstack/tacker zuul_work_dir: src/opendev.org/openstack/tacker
host-vars: host-vars:
@ -232,12 +237,24 @@
router" router"
Q_ML2_PLUGIN_EXT_DRIVERS: port_security,qos Q_ML2_PLUGIN_EXT_DRIVERS: port_security,qos
L2_AGENT_EXTENSIONS: 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: devstack_plugins:
ceilometer: https://opendev.org/openstack/ceilometer ceilometer: https://opendev.org/openstack/ceilometer
devstack_services: devstack_services:
ceilometer-acompute: true ceilometer-acompute: true
# To override the parent job's definitions. # To override the parent job's definitions.
tls-proxy: false 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: - job:
name: tacker-functional-devstack-multinode-sol name: tacker-functional-devstack-multinode-sol
@ -289,7 +306,10 @@
- openstack/heat - openstack/heat
- openstack/horizon - openstack/horizon
- openstack/keystone - 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/mistral
- openstack/neutron - openstack/neutron
- openstack/nova - openstack/nova
@ -403,6 +423,11 @@
TACKER_HOST: "{{ hostvars['controller-tacker']['nodepool']['private_ipv4'] }}" TACKER_HOST: "{{ hostvars['controller-tacker']['nodepool']['private_ipv4'] }}"
TACKER_MODE: standalone TACKER_MODE: standalone
USE_PYTHON3: true 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: devstack_services:
dstat: false dstat: false
horizon: false horizon: false
@ -416,6 +441,12 @@
n-sch: false n-sch: false
q-agt: true q-agt: true
tls-proxy: false 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: vars:
devstack_localrc: devstack_localrc:
CELLSV2_SETUP: singleconductor CELLSV2_SETUP: singleconductor
@ -437,6 +468,11 @@
TACKER_MODE: standalone TACKER_MODE: standalone
USE_PYTHON3: true USE_PYTHON3: true
DEVSTACK_PARALLEL: 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: devstack_local_conf:
post-config: post-config:
$NEUTRON_DHCP_CONF: $NEUTRON_DHCP_CONF: