Merge "Wait for tenant VM netcat server start on fast setups"
diff --git a/zuul.d/master_jobs.yaml b/zuul.d/master_jobs.yaml
index 4484768..3aee414 100644
--- a/zuul.d/master_jobs.yaml
+++ b/zuul.d/master_jobs.yaml
@@ -189,6 +189,7 @@
provider_net_base_segm_id: 1
snat_rules_apply_to_nested_networks: true
irrelevant-files:
+ - ^\.pre-commit-config\.yaml$
- ^\.pylintrc$
- ^(test-|)requirements.txt$
- ^lower-constraints.txt$
@@ -273,6 +274,7 @@
firewall_driver: openvswitch
snat_rules_apply_to_nested_networks: true
irrelevant-files:
+ - ^\.pre-commit-config\.yaml$
- ^\.pylintrc$
- ^(test-|)requirements.txt$
- ^lower-constraints.txt$
@@ -381,6 +383,7 @@
firewall_driver: iptables_hybrid
snat_rules_apply_to_nested_networks: true
irrelevant-files:
+ - ^\.pre-commit-config\.yaml$
- ^\.pylintrc$
- ^(test-|)requirements.txt$
- ^lower-constraints.txt$
@@ -541,6 +544,7 @@
firewall_driver: iptables
snat_rules_apply_to_nested_networks: true
irrelevant-files:
+ - ^\.pre-commit-config\.yaml$
- ^\.pylintrc$
- ^(test-|)requirements.txt$
- ^lower-constraints.txt$
@@ -681,6 +685,7 @@
'/var/log/openvswitch': 'logs'
'/var/lib/ovn': 'logs'
irrelevant-files:
+ - ^\.pre-commit-config\.yaml$
- ^\.pylintrc$
- ^(test-|)requirements.txt$
- ^lower-constraints.txt$
@@ -934,6 +939,7 @@
agent:
availability_zone: nova
irrelevant-files:
+ - ^\.pre-commit-config\.yaml$
- ^\.pylintrc$
- ^(test-|)requirements.txt$
- ^lower-constraints.txt$
@@ -1003,6 +1009,7 @@
- neutron-tempest-plugin
tempest_test_regex: ^neutron_tempest_plugin\.scenario\.test_dns_integration
irrelevant-files:
+ - ^\.pre-commit-config\.yaml$
- ^\.pylintrc$
- ^(test-|)requirements.txt$
- ^lower-constraints.txt$
@@ -1109,6 +1116,7 @@
# https://bugs.launchpad.net/networking-sfc/+bug/1660366
tempest_concurrency: 1
irrelevant-files:
+ - ^\.pre-commit-config\.yaml$
- ^\.pylintrc$
- ^(test-|)requirements.txt$
- ^lower-constraints.txt$
@@ -1182,6 +1190,7 @@
networking-bgpvpn: https://git.openstack.org/openstack/networking-bgpvpn
networking-bagpipe: https://git.openstack.org/openstack/networking-bagpipe
irrelevant-files:
+ - ^\.pre-commit-config\.yaml$
- ^\.pylintrc$
- ^(test-|)requirements.txt$
- ^lower-constraints.txt$
@@ -1242,6 +1251,7 @@
tempest_concurrency: 1
tempest_test_regex: ^neutron_tempest_plugin\.neutron_dynamic_routing
irrelevant-files:
+ - ^\.pre-commit-config\.yaml$
- ^\.pylintrc$
- ^(test-|)requirements.txt$
- ^lower-constraints.txt$
@@ -1297,6 +1307,7 @@
fwaas:
driver: ovn
irrelevant-files: &fwaas_irrelevant_files
+ - ^\.pre-commit-config\.yaml$
- ^\.pylintrc$
- ^(test-|)requirements.txt$
- ^lower-constraints.txt$
@@ -1402,6 +1413,7 @@
q-metering: true
q-l3: true
irrelevant-files:
+ - ^\.pre-commit-config\.yaml$
- ^\.pylintrc$
- ^(test-|)requirements.txt$
- ^lower-constraints.txt$
@@ -1467,6 +1479,7 @@
skip_6in6_tests: true
irrelevant-files:
+ - ^\.pre-commit-config\.yaml$
- ^\.pylintrc$
- ^(test-|)requirements.txt$
- ^lower-constraints.txt$
@@ -1583,6 +1596,7 @@
tempest: true
dstat: true
irrelevant-files: &taas_irrelevant_files
+ - ^\.pre-commit-config\.yaml$
- ^\.pylintrc$
- ^(test-|)requirements.txt$
- ^lower-constraints.txt$
diff --git a/zuul.d/project.yaml b/zuul.d/project.yaml
index 52243fb..5841ee5 100644
--- a/zuul.d/project.yaml
+++ b/zuul.d/project.yaml
@@ -214,7 +214,6 @@
templates:
- build-openstack-docs-pti
- neutron-tempest-plugin-jobs
- - neutron-tempest-plugin-jobs-2024-1
- neutron-tempest-plugin-jobs-2024-2
- neutron-tempest-plugin-jobs-2025-1
- neutron-tempest-plugin-jobs-2025-2
@@ -224,36 +223,30 @@
check:
jobs:
- neutron-tempest-plugin-sfc
- - neutron-tempest-plugin-sfc-2024-1
- neutron-tempest-plugin-sfc-2024-2
- neutron-tempest-plugin-sfc-2025-1
- neutron-tempest-plugin-sfc-2025-2
- neutron-tempest-plugin-bgpvpn-bagpipe
- - neutron-tempest-plugin-bgpvpn-bagpipe-2024-1
- neutron-tempest-plugin-bgpvpn-bagpipe-2024-2
- neutron-tempest-plugin-bgpvpn-bagpipe-2025-1
- neutron-tempest-plugin-bgpvpn-bagpipe-2025-2
- neutron-tempest-plugin-dynamic-routing:
voting: false # See LP#2130631
- - neutron-tempest-plugin-dynamic-routing-2024-1
- neutron-tempest-plugin-dynamic-routing-2024-2
- neutron-tempest-plugin-dynamic-routing-2025-1
- neutron-tempest-plugin-dynamic-routing-2025-2
- neutron-tempest-plugin-fwaas-ovn
- neutron-tempest-plugin-fwaas-openvswitch
- - neutron-tempest-plugin-fwaas-2024-1
- neutron-tempest-plugin-fwaas-2024-2
- neutron-tempest-plugin-fwaas-2025-1
- neutron-tempest-plugin-fwaas-2025-2
- neutron-tempest-plugin-vpnaas
- neutron-tempest-plugin-vpnaas-ovn
- - neutron-tempest-plugin-vpnaas-2024-1
- neutron-tempest-plugin-vpnaas-2024-2
- neutron-tempest-plugin-vpnaas-2025-1
- neutron-tempest-plugin-vpnaas-2025-2
- neutron-tempest-plugin-tap-as-a-service
- neutron-tempest-plugin-tap-as-a-service-ovn
- - neutron-tempest-plugin-tap-as-a-service-2024-1
- neutron-tempest-plugin-tap-as-a-service-2024-2
- neutron-tempest-plugin-tap-as-a-service-2025-1
- neutron-tempest-plugin-tap-as-a-service-2025-2