Fix the functional test devstack job

From last couple of months, the functional devstack job was broken.
Fixed the devstack job so that functional tests are run on multi-node setup.

Change-Id: I16906c2fb4ff71f0b4ddc42010182a0203c75231
This commit is contained in:
tpatil 2020-04-05 06:01:31 +00:00
parent 40435eb12c
commit 067d00371b
2 changed files with 57 additions and 12 deletions

View File

@ -37,6 +37,12 @@
- zuul: openstack-infra/devstack
timeout: 9000
required-projects:
- openstack/cinder
- openstack/glance
- openstack/keystone
- openstack/neutron
- openstack/nova
- openstack/placement
- openstack/aodh
- openstack/blazar
- openstack/blazar-nova
@ -57,15 +63,11 @@
devstack_localrc:
CELLSV2_SETUP: singleconductor
Q_DVR_MODE: dvr
DATABASE_TYPE: mysql
Q_SERVICE_PLUGIN_CLASSES: router,neutron.services.metering.metering_plugin.MeteringPlugin,networking_sfc.services.flowclassifier.plugin.FlowClassifierPlugin,neutron.services.qos.qos_plugin.QoSPlugin,qos
Q_ML2_PLUGIN_EXT_DRIVERS: port_security,qos
L2_AGENT_EXTENSIONS: qos
test_matrix_configs: [neutron]
devstack_services:
horizon: false
swift: false
s-account: false
s-container: false
s-object: false
s-proxy: false
c-bak: false
zuul_work_dir: src/opendev.org/openstack/tacker
host-vars:
controller:
@ -79,16 +81,52 @@
tacker: https://opendev.org/openstack/tacker
blazar: https://opendev.org/openstack/blazar
devstack_services:
# Core services enabled for this branch.
# This list replaces the test-matrix.
# Shared services
mysql: true
rabbit: true
tls-proxy: false
# Keystone services
key: true
# Glance services
g-api: true
# Nova services
n-api: true
n-api-meta: true
n-cond: true
n-cpu: true
n-novnc: true
n-sch: true
placement-api: true
# Neutron services
# We need to keep using the neutron-legacy based services for
# now until all issues with the new lib/neutron code are solved
q-agt: true
q-dhcp: true
q-l3: true
q-meta: true
q-metering: true
q-svc: true
q-qos: true
# Cinder services
c-api: true
c-sch: true
c-vol: true
cinder: true
# Tacker services
tacker: true
tacker-conductor: true
# Services we don't need.
# This section is not really needed, it's for readability.
horizon: false
tempest: false
swift: false
s-account: false
s-container: false
s-object: false
s-proxy: false
c-bak: false
tacker: true
tacker-conductor: true
q-svc: true
tox_install_siblings: false
tox_envlist: dsvm-functional
group-vars:
@ -96,6 +134,7 @@
devstack_localrc:
CELLSV2_SETUP: singleconductor
PHYSICAL_NETWORK: mgmtphysnet0
DATABASE_TYPE: mysql
devstack_services:
q-agt: true
n-api: false

View File

@ -235,7 +235,6 @@ function configure_tacker {
_tacker_setup_keystone $TACKER_CONF keystone_authtoken
if [[ "${TACKER_MODE}" == "all" ]]; then
iniset "/$Q_PLUGIN_CONF_FILE" ml2 extension_drivers port_security
iniset "/$Q_PLUGIN_CONF_FILE" ml2_type_flat flat_networks $PUBLIC_PHYSICAL_NETWORK,$MGMT_PHYS_NET
iniset "/$Q_PLUGIN_CONF_FILE" ovs bridge_mappings $PUBLIC_PHYSICAL_NETWORK:$PUBLIC_BRIDGE,$MGMT_PHYS_NET:$BR_MGMT
@ -432,8 +431,15 @@ function tacker_register_default_vim {
echo "The content of VIM config file $VIM_CONFIG_FILE :"
cat $VIM_CONFIG_FILE
DEFAULT_VIM_NAME="VIM0"
# TODO(tpatil): Remove installing python-tackerclient using pip once
# a solution is available to install it using requirements.
pip_install python-tackerclient
cat >> $TACKER_DIR/tools/test-setup-default-vim.sh <<EOF
openstack --os-username nfv_user --os-project-name nfv --os-password devstack --os-auth-url ${KEYSTONE_SERVICE_URI} --os-project-domain-name Default --os-user-domain-name Default vim register --is-default --description "Default VIM" --config-file $VIM_CONFIG_FILE $DEFAULT_VIM_NAME
EOF
echo "The content of $TACKER_DIR/tools/test-setup-default-vim.sh"
cat $TACKER_DIR/tools/test-setup-default-vim.sh