Restore the tempest nftables jobs in experimental and periodic queues

The job names were changed but not replaced in the
"neutron-periodic-jobs" template.

This patch is also adding new binaries to the nftables installation
role, that includes all the "-save" and "-restore" ones.

Closes-Bug: #2039027

Change-Id: Ia4c140af74db29f4e40299648f1b5091b4801b51
(cherry picked from commit daa0d1c5a2bec7b78837686eff3ea052f0c45bd7)
(cherry picked from commit 591cf6c35c2986a4d11517c08bcf654802bb1a6a)
Conflicts:
	zuul.d/job-templates.yaml
This commit is contained in:
Rodolfo Alonso Hernandez 2023-10-10 17:13:59 +00:00 committed by yatinkarel
parent 85b25009af
commit 66a55a2844
2 changed files with 8 additions and 2 deletions

View File

@ -8,8 +8,14 @@
shell:
cmd: |
/usr/bin/update-alternatives --set iptables /usr/sbin/iptables-nft
/usr/bin/update-alternatives --set iptables-save /usr/sbin/iptables-nft-save
/usr/bin/update-alternatives --set iptables-restore /usr/sbin/iptables-nft-restore
/usr/bin/update-alternatives --set ip6tables /usr/sbin/ip6tables-nft
/usr/bin/update-alternatives --set ip6tables-save /usr/sbin/ip6tables-nft-save
/usr/bin/update-alternatives --set ip6tables-restore /usr/sbin/ip6tables-nft-restore
/usr/bin/update-alternatives --set ebtables /usr/sbin/ebtables-nft
/usr/bin/update-alternatives --set ebtables-save /usr/sbin/ebtables-nft-save
/usr/bin/update-alternatives --set ebtables-restore /usr/sbin/ebtables-nft-restore
/usr/bin/update-alternatives --set arptables /usr/sbin/arptables-nft
executable: /bin/bash
become: yes

View File

@ -83,8 +83,8 @@
- neutron-ovn-tripleo-ci-centos-9-containers-multinode:
vars: *consumer_vars
dependencies: *consumer_deps
- neutron-linuxbridge-tempest-plugin-scenario-nftables
- neutron-ovs-tempest-plugin-scenario-iptables_hybrid-nftables
- neutron-linuxbridge-tempest-plugin-nftables
- neutron-ovs-tempest-plugin-iptables_hybrid-nftables
- devstack-enforce-scope
- tempest-integrated-networking:
irrelevant-files: