Fix OVN jobs, expand swap size, fix l-c
This fixes 3 issues in order to unblock CI: 1. OVN job is fixed by updating it's configs to match what Neutron uses to configure DevStack with OVN. 2. lower-constraints job will run on Ubuntu Bionic and Python 3.6, allowing it to work with deps that don't support 3.8. 3. Swap size in our jobs is set to 8 GBs as recently the default got shrinked to 1 GB which is way too little for our Amphora jobs. Also some additional OVN debugging info will get gathered. Change-Id: I70c867ac21004586c014e9eb797dbf528dd6e3f2
This commit is contained in:
parent
6a5f654739
commit
c31702ebb8
|
@ -31,6 +31,8 @@
|
||||||
devstack-plugin-container: https://opendev.org/openstack/devstack-plugin-container
|
devstack-plugin-container: https://opendev.org/openstack/devstack-plugin-container
|
||||||
kuryr-tempest-plugin: https://opendev.org/openstack/kuryr-tempest-plugin
|
kuryr-tempest-plugin: https://opendev.org/openstack/kuryr-tempest-plugin
|
||||||
vars:
|
vars:
|
||||||
|
# Default swap size got shrinked to 1 GB, it's way too small for us.
|
||||||
|
configure_swap_size: 8192
|
||||||
tempest_test_regex: '^(kuryr_tempest_plugin.tests.)'
|
tempest_test_regex: '^(kuryr_tempest_plugin.tests.)'
|
||||||
tox_envlist: 'all'
|
tox_envlist: 'all'
|
||||||
devstack_localrc:
|
devstack_localrc:
|
||||||
|
|
|
@ -44,11 +44,22 @@
|
||||||
- kuryr-kubernetes-tempest-multinode-ha
|
- kuryr-kubernetes-tempest-multinode-ha
|
||||||
- kuryr-kubernetes-tempest-containerized-crio
|
- kuryr-kubernetes-tempest-containerized-crio
|
||||||
|
|
||||||
|
- project-template:
|
||||||
|
name: kuryr-kubernetes-lower-constraints-bionic-jobs
|
||||||
|
check:
|
||||||
|
jobs:
|
||||||
|
- openstack-tox-lower-constraints:
|
||||||
|
nodeset: ubuntu-bionic
|
||||||
|
gate:
|
||||||
|
jobs:
|
||||||
|
- openstack-tox-lower-constraints:
|
||||||
|
nodeset: ubuntu-bionic
|
||||||
|
|
||||||
- project:
|
- project:
|
||||||
templates:
|
templates:
|
||||||
- openstack-python3-victoria-jobs
|
- openstack-python3-victoria-jobs
|
||||||
- openstack-lower-constraints-jobs
|
|
||||||
- publish-openstack-docs-pti
|
- publish-openstack-docs-pti
|
||||||
- release-notes-jobs-python3
|
- release-notes-jobs-python3
|
||||||
- check-requirements
|
- check-requirements
|
||||||
|
- kuryr-kubernetes-lower-constraints-bionic-jobs
|
||||||
- kuryr-kubernetes-tempest-jobs
|
- kuryr-kubernetes-tempest-jobs
|
||||||
|
|
|
@ -26,6 +26,8 @@
|
||||||
vars:
|
vars:
|
||||||
devstack_localrc:
|
devstack_localrc:
|
||||||
Q_AGENT: ovn
|
Q_AGENT: ovn
|
||||||
|
ML2_L3_PLUGIN: ovn-router,trunk
|
||||||
|
OVN_DBS_LOG_LEVEL: dbg
|
||||||
Q_ML2_PLUGIN_MECHANISM_DRIVERS: ovn,logger
|
Q_ML2_PLUGIN_MECHANISM_DRIVERS: ovn,logger
|
||||||
Q_ML2_PLUGIN_TYPE_DRIVERS: local,flat,vlan,geneve
|
Q_ML2_PLUGIN_TYPE_DRIVERS: local,flat,vlan,geneve
|
||||||
Q_ML2_TENANT_NETWORK_TYPE: geneve
|
Q_ML2_TENANT_NETWORK_TYPE: geneve
|
||||||
|
@ -33,10 +35,10 @@
|
||||||
Q_USE_PROVIDERNET_FOR_PUBLIC: true
|
Q_USE_PROVIDERNET_FOR_PUBLIC: true
|
||||||
PHYSICAL_NETWORK: public
|
PHYSICAL_NETWORK: public
|
||||||
OVN_L3_CREATE_PUBLIC_NETWORK: true
|
OVN_L3_CREATE_PUBLIC_NETWORK: true
|
||||||
# OVN already builds from source by default
|
ENABLE_CHASSIS_AS_GW: true
|
||||||
Q_BUILD_OVS_FROM_GIT: false
|
OVN_BRANCH: v20.06.1
|
||||||
KURYR_NEUTRON_DEFAULT_ROUTER: kuryr-router
|
KURYR_NEUTRON_DEFAULT_ROUTER: kuryr-router
|
||||||
OVN_BRANCH: branch-20.06
|
ENABLE_TLS: True
|
||||||
devstack_services:
|
devstack_services:
|
||||||
ovn-northd: true
|
ovn-northd: true
|
||||||
ovn-controller: true
|
ovn-controller: true
|
||||||
|
@ -47,6 +49,12 @@
|
||||||
q-dhcp: false
|
q-dhcp: false
|
||||||
q-meta: false
|
q-meta: false
|
||||||
q-trunk: true
|
q-trunk: true
|
||||||
|
ovs-vswitchd: true
|
||||||
|
ovsdb-server: 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'
|
||||||
|
|
||||||
- job:
|
- job:
|
||||||
name: kuryr-kubernetes-tempest-containerized-ovn
|
name: kuryr-kubernetes-tempest-containerized-ovn
|
||||||
|
@ -143,7 +151,6 @@
|
||||||
KURYR_K8S_OCTAVIA_MEMBER_MODE: L2
|
KURYR_K8S_OCTAVIA_MEMBER_MODE: L2
|
||||||
KURYR_ENFORCE_SG_RULES: false
|
KURYR_ENFORCE_SG_RULES: false
|
||||||
KURYR_LB_ALGORITHM: SOURCE_IP_PORT
|
KURYR_LB_ALGORITHM: SOURCE_IP_PORT
|
||||||
KURYR_HYPERKUBE_VERSION: v1.16.0
|
|
||||||
KURYR_ENABLED_HANDLERS: vif,endpoints,service,namespace,pod_label,policy,kuryrnetworkpolicy,kuryrnetwork,kuryrport,kuryrloadbalancer
|
KURYR_ENABLED_HANDLERS: vif,endpoints,service,namespace,pod_label,policy,kuryrnetworkpolicy,kuryrnetwork,kuryrport,kuryrloadbalancer
|
||||||
KURYR_SG_DRIVER: policy
|
KURYR_SG_DRIVER: policy
|
||||||
KURYR_SUBNET_DRIVER: namespace
|
KURYR_SUBNET_DRIVER: namespace
|
||||||
|
|
Loading…
Reference in New Issue