diff --git a/zuul.d/project.yaml b/zuul.d/project.yaml index 055fdfc0..936bd115 100644 --- a/zuul.d/project.yaml +++ b/zuul.d/project.yaml @@ -181,7 +181,6 @@ templates: - build-openstack-docs-pti - neutron-tempest-plugin-jobs - - neutron-tempest-plugin-jobs-train - neutron-tempest-plugin-jobs-ussuri - neutron-tempest-plugin-jobs-victoria - neutron-tempest-plugin-jobs-wallaby @@ -191,12 +190,10 @@ check: jobs: - neutron-tempest-plugin-sfc - - neutron-tempest-plugin-sfc-train - neutron-tempest-plugin-sfc-ussuri - neutron-tempest-plugin-sfc-victoria - neutron-tempest-plugin-sfc-wallaby - neutron-tempest-plugin-bgpvpn-bagpipe - - neutron-tempest-plugin-bgpvpn-bagpipe-train - neutron-tempest-plugin-bgpvpn-bagpipe-ussuri - neutron-tempest-plugin-bgpvpn-bagpipe-victoria - neutron-tempest-plugin-bgpvpn-bagpipe-wallaby @@ -217,10 +214,6 @@ experimental: jobs: - - neutron-tempest-plugin-fwaas-train: - # 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-ussuri: # TODO(slaweq): switch it to be voting when bug # https://bugs.launchpad.net/neutron/+bug/1858645 will be fixed diff --git a/zuul.d/train_jobs.yaml b/zuul.d/train_jobs.yaml index 75c8ebe8..b87dc8c8 100644 --- a/zuul.d/train_jobs.yaml +++ b/zuul.d/train_jobs.yaml @@ -3,6 +3,11 @@ parent: neutron-tempest-plugin-api nodeset: openstack-single-node-bionic override-checkout: stable/train + required-projects: &required-projects-train + - openstack/neutron + - name: openstack/neutron-tempest-plugin + override-checkout: 1.5.0 + - openstack/tempest vars: devstack_services: # Disable OVN services @@ -122,6 +127,7 @@ parent: neutron-tempest-plugin-scenario-openvswitch nodeset: openstack-single-node-bionic override-checkout: stable/train + required-projects: *required-projects-train vars: branch_override: stable/train network_api_extensions: *api_extensions @@ -146,6 +152,7 @@ parent: neutron-tempest-plugin-scenario-openvswitch-iptables_hybrid nodeset: openstack-single-node-bionic override-checkout: stable/train + required-projects: *required-projects-train vars: branch_override: stable/train network_api_extensions: *api_extensions @@ -170,6 +177,7 @@ parent: neutron-tempest-plugin-scenario-linuxbridge nodeset: openstack-single-node-bionic override-checkout: stable/train + required-projects: *required-projects-train vars: branch_override: stable/train network_api_extensions: *api_extensions @@ -194,6 +202,7 @@ parent: neutron-tempest-plugin-dvr-multinode-scenario nodeset: openstack-two-node-bionic override-checkout: stable/train + required-projects: *required-projects-train vars: network_api_extensions_common: *api_extensions branch_override: stable/train @@ -203,6 +212,7 @@ parent: neutron-tempest-plugin-designate-scenario nodeset: openstack-single-node-bionic override-checkout: stable/train + required-projects: *required-projects-train vars: branch_override: stable/train network_api_extensions_common: *api_extensions @@ -212,6 +222,7 @@ parent: neutron-tempest-plugin-sfc nodeset: openstack-single-node-bionic override-checkout: stable/train + required-projects: *required-projects-train vars: branch_override: stable/train network_api_extensions_common: *api_extensions @@ -221,6 +232,7 @@ parent: neutron-tempest-plugin-bgpvpn-bagpipe nodeset: openstack-single-node-bionic override-checkout: stable/train + required-projects: *required-projects-train vars: branch_override: stable/train network_api_extensions: *api_extensions @@ -230,6 +242,7 @@ parent: neutron-tempest-plugin-fwaas-ussuri nodeset: openstack-single-node-bionic override-checkout: stable/train + required-projects: *required-projects-train vars: branch_override: stable/train network_api_extensions_common: *api_extensions