Merge "[WSGI] Move all OVS jobs to use WSGI API module"
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
new file mode 100644
index 0000000..2ff8c11
--- /dev/null
+++ b/.pre-commit-config.yaml
@@ -0,0 +1,33 @@
+---
+default_language_version:
+ # force all unspecified python hooks to run python3
+ python: python3
+repos:
+ - repo: https://github.com/pre-commit/pre-commit-hooks
+ rev: v4.5.0
+ hooks:
+ - id: trailing-whitespace
+ - id: mixed-line-ending
+ args: ['--fix', 'lf']
+ exclude: '.*\.(svg)$'
+ - id: check-byte-order-marker
+ - id: check-executables-have-shebangs
+ - id: check-merge-conflict
+ - id: debug-statements
+ - id: check-yaml
+ files: .*\.(yaml|yml)$
+ - repo: https://github.com/lucas-c/pre-commit-hooks
+ rev: v1.5.4
+ hooks:
+ - id: remove-tabs
+ exclude: '.*\.(svg)$'
+ - repo: local
+ hooks:
+ - id: flake8
+ name: flake8
+ additional_dependencies:
+ - hacking>=3.2.0,<3.3.0
+ language: python
+ entry: flake8
+ files: '^.*\.py$'
+ exclude: '^(doc|releasenotes|tools)/.*$'
diff --git a/zuul.d/base-nested-switch.yaml b/zuul.d/base-nested-switch.yaml
index 8533e07..f8fa799 100644
--- a/zuul.d/base-nested-switch.yaml
+++ b/zuul.d/base-nested-switch.yaml
@@ -34,9 +34,10 @@
# NOTE(ykarel): seeing issues with host-passthrough mode
# https://bugs.launchpad.net/neutron/+bug/2036603
# LIBVIRT_CPU_MODE: host-passthrough
- CIRROS_VERSION: 0.6.2
- DEFAULT_IMAGE_NAME: cirros-0.6.2-x86_64-disk
- DEFAULT_IMAGE_FILE_NAME: cirros-0.6.2-x86_64-disk.img
+ # TODO(ykarel): switch to 0.6.2+ once lp#2045549 is fixed
+ CIRROS_VERSION: 0.5.3
+ DEFAULT_IMAGE_NAME: cirros-0.5.3-x86_64-disk
+ DEFAULT_IMAGE_FILE_NAME: cirros-0.5.3-x86_64-disk.img
# Base nested switch job for yoga and zed
- job:
diff --git a/zuul.d/master_jobs.yaml b/zuul.d/master_jobs.yaml
index daf5165..90379a1 100644
--- a/zuul.d/master_jobs.yaml
+++ b/zuul.d/master_jobs.yaml
@@ -235,7 +235,7 @@
parent: neutron-tempest-plugin-base-nested-switch
timeout: 10000
vars:
- configure_swap_size: 2048
+ configure_swap_size: 3072
devstack_services:
# Disable OVN services
br-ex-tcpdump: false
@@ -342,7 +342,7 @@
parent: neutron-tempest-plugin-base-nested-switch
timeout: 10000
vars:
- configure_swap_size: 2048
+ configure_swap_size: 3072
devstack_services:
# Disable OVN services
br-ex-tcpdump: false
@@ -511,7 +511,7 @@
- zuul: openstack/neutron
pre-run: playbooks/linuxbridge-scenario-pre-run.yaml
vars:
- configure_swap_size: 2048
+ configure_swap_size: 3072
devstack_services:
# Disable OVN services
br-ex-tcpdump: false
diff --git a/zuul.d/project.yaml b/zuul.d/project.yaml
index 79762cd..9a20f80 100644
--- a/zuul.d/project.yaml
+++ b/zuul.d/project.yaml
@@ -6,7 +6,10 @@
- neutron-tempest-plugin-openvswitch-iptables_hybrid
- neutron-tempest-plugin-openvswitch-enforce-scope-old-defaults
- neutron-tempest-plugin-ovn
- - neutron-tempest-plugin-designate-scenario
+ - neutron-tempest-plugin-designate-scenario:
+ # TODO(slaweq) make job voting again once bug
+ # https://bugs.launchpad.net/designate/+bug/2072627 will be fixed
+ voting: false
gate:
jobs:
- neutron-tempest-plugin-openvswitch