Remove jobs for neutron-fwaas master branch
Neutron-fwaas is going to be deprecated in master branch with [1].
[1] https://review.opendev.org/#/c/735828/
Depends-On: https://review.opendev.org/#/c/735829/
Change-Id: I432523933a7f930932fd2fd7d25b948b02f275f5
diff --git a/zuul.d/master_jobs.yaml b/zuul.d/master_jobs.yaml
index d4927c5..7e93aaf 100644
--- a/zuul.d/master_jobs.yaml
+++ b/zuul.d/master_jobs.yaml
@@ -418,27 +418,6 @@
networking-bagpipe: https://git.openstack.org/openstack/networking-bagpipe
- job:
- name: neutron-tempest-plugin-fwaas
- parent: neutron-tempest-plugin-base
- timeout: 10800
- required-projects:
- - openstack/devstack-gate
- - openstack/neutron-fwaas
- - openstack/neutron
- - openstack/neutron-tempest-plugin
- - openstack/tempest
- vars:
- tempest_test_regex: ^neutron_tempest_plugin\.fwaas
- devstack_plugins:
- neutron-fwaas: https://opendev.org/openstack/neutron-fwaas.git
- neutron-tempest-plugin: https://opendev.org/openstack/neutron-tempest-plugin.git
- network_api_extensions_common: *api_extensions
- network_api_extensions_fwaas:
- - fwaas_v2
- devstack_localrc:
- NETWORK_API_EXTENSIONS: "{{ (network_api_extensions_common + network_api_extensions_fwaas) | join(',') }}"
-
-- job:
name: neutron-tempest-plugin-dynamic-routing
parent: neutron-tempest-plugin-base
description: |
diff --git a/zuul.d/project.yaml b/zuul.d/project.yaml
index c6bf1a0..8e1ed31 100644
--- a/zuul.d/project.yaml
+++ b/zuul.d/project.yaml
@@ -102,10 +102,6 @@
- neutron-tempest-plugin-bgpvpn-bagpipe
- neutron-tempest-plugin-bgpvpn-bagpipe-train
- neutron-tempest-plugin-bgpvpn-bagpipe-ussuri
- - neutron-tempest-plugin-fwaas:
- # TODO(slaweq): switch it to be voting when bug
- # https://bugs.launchpad.net/neutron/+bug/1858645 will be fixed
- voting: false
- neutron-tempest-plugin-fwaas-train:
# TODO(slaweq): switch it to be voting when bug
# https://bugs.launchpad.net/neutron/+bug/1858645 will be fixed
@@ -123,7 +119,4 @@
jobs:
- neutron-tempest-plugin-sfc
- neutron-tempest-plugin-bgpvpn-bagpipe
- # TODO(slaweq): bring it back to gate queue
- # https://bugs.launchpad.net/neutron/+bug/1858645 will be fixed
- # - neutron-tempest-plugin-fwaas
- neutron-tempest-plugin-dynamic-routing
diff --git a/zuul.d/train_jobs.yaml b/zuul.d/train_jobs.yaml
index f2dd6b7..132873b 100644
--- a/zuul.d/train_jobs.yaml
+++ b/zuul.d/train_jobs.yaml
@@ -144,7 +144,7 @@
- job:
name: neutron-tempest-plugin-fwaas-train
- parent: neutron-tempest-plugin-fwaas
+ parent: neutron-tempest-plugin-fwaas-ussuri
override-checkout: stable/train
vars:
branch_override: stable/train
diff --git a/zuul.d/ussuri_jobs.yaml b/zuul.d/ussuri_jobs.yaml
index a9c369f..4e7bd5d 100644
--- a/zuul.d/ussuri_jobs.yaml
+++ b/zuul.d/ussuri_jobs.yaml
@@ -148,11 +148,26 @@
- job:
name: neutron-tempest-plugin-fwaas-ussuri
- parent: neutron-tempest-plugin-fwaas
+ parent: neutron-tempest-plugin-base
+ timeout: 10800
override-checkout: stable/ussuri
+ required-projects:
+ - openstack/devstack-gate
+ - openstack/neutron-fwaas
+ - openstack/neutron
+ - openstack/neutron-tempest-plugin
+ - openstack/tempest
vars:
branch_override: stable/ussuri
+ tempest_test_regex: ^neutron_tempest_plugin\.fwaas
+ devstack_plugins:
+ neutron-fwaas: https://opendev.org/openstack/neutron-fwaas.git
+ neutron-tempest-plugin: https://opendev.org/openstack/neutron-tempest-plugin.git
network_api_extensions_common: *api_extensions
+ network_api_extensions_fwaas:
+ - fwaas_v2
+ devstack_localrc:
+ NETWORK_API_EXTENSIONS: "{{ (network_api_extensions_common + network_api_extensions_fwaas) | join(',') }}"
- job:
name: neutron-tempest-plugin-dynamic-routing-ussuri