Fix multinode gate, separate variations for OVN and OVS.
Change-Id: I425e7fe1d220b5f760bd5514c853d3e377190d82
This commit is contained in:
parent
aae39f5011
commit
3c3d4564db
|
@ -65,6 +65,11 @@
|
|||
c-vol: false
|
||||
cinder: false
|
||||
tempest: true
|
||||
ovn-controller: false
|
||||
ovn-northd: false
|
||||
q-ovn-metadata-agent: false
|
||||
ovs-vswitchd: false
|
||||
ovsdb-server: false
|
||||
neutron: true
|
||||
q-agt: true
|
||||
q-dhcp: true
|
||||
|
|
|
@ -20,38 +20,86 @@
|
|||
nodeset: openstack-two-node-focal
|
||||
host-vars:
|
||||
controller:
|
||||
devstack_plugins:
|
||||
devstack-plugin-container: https://opendev.org/openstack/devstack-plugin-container
|
||||
kuryr-kubernetes: https://opendev.org/openstack/kuryr-kubernetes
|
||||
octavia: https://opendev.org/openstack/octavia
|
||||
devstack_services:
|
||||
kubernetes-worker: false
|
||||
kubernetes-master: true
|
||||
kuryr-daemon: true
|
||||
kuryr-kubernetes: true
|
||||
group-vars:
|
||||
subnode:
|
||||
devstack_plugins:
|
||||
devstack-plugin-container: https://opendev.org/openstack/devstack-plugin-container
|
||||
kuryr-kubernetes: https://opendev.org/openstack/kuryr
|
||||
devstack_services:
|
||||
# Need to disable dstat due to bug https://github.com/dstat-real/dstat/pull/162
|
||||
dstat: false
|
||||
kuryr-daemon: true
|
||||
kuryr-kubernetes: false
|
||||
kubernetes-worker: true
|
||||
kubernetes-master: false
|
||||
tls-proxy: false
|
||||
c-vol: false
|
||||
c-bak: false
|
||||
devstack_localrc:
|
||||
KURYR_FORCE_IMAGE_BUILD: true
|
||||
USE_PYTHON3: true
|
||||
kubernetes-worker: true
|
||||
kuryr-kubernetes: false
|
||||
q-svc: false
|
||||
vars:
|
||||
devstack_localrc:
|
||||
KURYR_K8S_API_URL: "https://${SERVICE_HOST}:${KURYR_K8S_API_PORT}"
|
||||
KURYR_K8S_MULTI_WORKER_TESTS: True
|
||||
KURYR_K8S_API_URL: "https://${SERVICE_HOST}:${KURYR_K8S_API_PORT}"
|
||||
KURYR_K8S_MULTI_WORKER_TESTS: True
|
||||
|
||||
voting: true
|
||||
|
||||
- job:
|
||||
name: kuryr-kubernetes-tempest-multinode-ovn
|
||||
parent: kuryr-kubernetes-tempest
|
||||
description: |
|
||||
Kuryr-Kubernetes tempest multinode job using OVN
|
||||
nodeset: openstack-two-node-focal
|
||||
host-vars:
|
||||
controller:
|
||||
devstack_services:
|
||||
kubernetes-worker: false
|
||||
kubernetes-master: true
|
||||
group-vars:
|
||||
subnode:
|
||||
devstack_services:
|
||||
kubernetes-worker: true
|
||||
kubernetes-master: false
|
||||
kuryr-kubernetes: false
|
||||
q-svc: false
|
||||
ovn-northd: true
|
||||
vars:
|
||||
devstack_localrc:
|
||||
ENABLE_CHASSIS_AS_GW: true
|
||||
ENABLE_TLS: True
|
||||
KURYR_FORCE_IMAGE_BUILD: true
|
||||
KURYR_K8S_API_URL: "https://${SERVICE_HOST}:${KURYR_K8S_API_PORT}"
|
||||
KURYR_K8S_MULTI_WORKER_TESTS: True
|
||||
KURYR_NEUTRON_DEFAULT_ROUTER: kuryr-router
|
||||
ML2_L3_PLUGIN: ovn-router,trunk,qos
|
||||
OVN_BRANCH: v20.06.1
|
||||
OVN_BUILD_FROM_SOURCE: true
|
||||
OVN_DBS_LOG_LEVEL: dbg
|
||||
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
|
||||
USE_PYTHON3: true
|
||||
VAR_RUN_PATH: /usr/local/var/run
|
||||
devstack_services:
|
||||
tls-proxy: false
|
||||
kubernetes-worker: false
|
||||
kubernetes-master: true
|
||||
kuryr-daemon: true
|
||||
kuryr-kubernetes: true
|
||||
ovn-controller: true
|
||||
ovn-northd: true
|
||||
ovs-vswitchd: true
|
||||
ovsdb-server: true
|
||||
q-agt: false
|
||||
q-dhcp: false
|
||||
q-l3: false
|
||||
q-meta: false
|
||||
q-ovn-metadata-agent: true
|
||||
q-qos: true
|
||||
q-svc: true
|
||||
q-trunk: true
|
||||
zuul_copy_output:
|
||||
'{{ devstack_base_dir }}/data/ovn': 'logs'
|
||||
'{{ devstack_log_dir }}/ovsdb-server-nb.log': 'logs'
|
||||
'{{ devstack_log_dir }}/ovsdb-server-sb.log': 'logs'
|
||||
voting: false
|
||||
|
||||
- job:
|
||||
|
|
|
@ -16,16 +16,18 @@
|
|||
name: kuryr-kubernetes-tempest-jobs
|
||||
check:
|
||||
jobs:
|
||||
- kuryr-kubernetes-tempest-systemd
|
||||
- kuryr-kubernetes-tempest
|
||||
- kuryr-kubernetes-tempest-lower-constraints
|
||||
- kuryr-kubernetes-tempest-ovn
|
||||
- kuryr-kubernetes-tempest-network-policy
|
||||
# - kuryr-kubernetes-tempest-systemd
|
||||
# - kuryr-kubernetes-tempest
|
||||
# - kuryr-kubernetes-tempest-lower-constraints
|
||||
# - kuryr-kubernetes-tempest-ovn
|
||||
# - kuryr-kubernetes-tempest-network-policy
|
||||
- kuryr-kubernetes-tempest-multinode
|
||||
- kuryr-kubernetes-tempest-ipv6
|
||||
- kuryr-kubernetes-tempest-ovn-ipv6
|
||||
- kuryr-kubernetes-tempest-ovn-provider-ovn
|
||||
- kuryr-kubernetes-e2e-np-ovn-provider-ovn
|
||||
# one at the time
|
||||
# - kuryr-kubernetes-tempest-multinode-ovn
|
||||
# - kuryr-kubernetes-tempest-ipv6
|
||||
# - kuryr-kubernetes-tempest-ovn-ipv6
|
||||
# - kuryr-kubernetes-tempest-ovn-provider-ovn
|
||||
# - kuryr-kubernetes-e2e-np-ovn-provider-ovn
|
||||
gate:
|
||||
jobs:
|
||||
- kuryr-kubernetes-tempest-systemd
|
||||
|
@ -54,9 +56,9 @@
|
|||
|
||||
- project:
|
||||
templates:
|
||||
- openstack-python3-xena-jobs
|
||||
- publish-openstack-docs-pti
|
||||
- release-notes-jobs-python3
|
||||
- check-requirements
|
||||
- kuryr-kubernetes-lower-constraints-bionic-jobs
|
||||
#- openstack-python3-xena-jobs
|
||||
#- publish-openstack-docs-pti
|
||||
#- release-notes-jobs-python3
|
||||
#- check-requirements
|
||||
#- kuryr-kubernetes-lower-constraints-bionic-jobs
|
||||
- kuryr-kubernetes-tempest-jobs
|
||||
|
|
|
@ -83,7 +83,6 @@ KURYR_CNI_HEALTH_SERVER_PORT=${KURYR_CNI_HEALTH_SERVER_PORT:-8090}
|
|||
# High availability of controller
|
||||
KURYR_CONTROLLER_HA_PORT=${KURYR_CONTROLLER_HA_PORT:-16401}
|
||||
KURYR_CONTROLLER_REPLICAS=${KURYR_CONTROLLER_REPLICAS:-1}
|
||||
KURYR_FORCE_IMAGE_BUILD=${KURYR_FORCE_IMAGE_BUILD:-False}
|
||||
|
||||
# Whether to use lower-constraints.txt when installing dependencies.
|
||||
KURYR_CONTAINERS_USE_LOWER_CONSTRAINTS=${KURYR_CONTAINERS_USE_LOWER_CONSTRAINTS:-False}
|
||||
|
|
Loading…
Reference in New Issue