Skip to content

Commit 591cf6c

Browse files
ralonsohkarelyatin
authored andcommitted
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 daa0d1c)
1 parent 1bc5068 commit 591cf6c

File tree

2 files changed

+8
-2
lines changed

2 files changed

+8
-2
lines changed

roles/nftables/tasks/main.yaml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,14 @@
88
shell:
99
cmd: |
1010
/usr/bin/update-alternatives --set iptables /usr/sbin/iptables-nft
11+
/usr/bin/update-alternatives --set iptables-save /usr/sbin/iptables-nft-save
12+
/usr/bin/update-alternatives --set iptables-restore /usr/sbin/iptables-nft-restore
1113
/usr/bin/update-alternatives --set ip6tables /usr/sbin/ip6tables-nft
14+
/usr/bin/update-alternatives --set ip6tables-save /usr/sbin/ip6tables-nft-save
15+
/usr/bin/update-alternatives --set ip6tables-restore /usr/sbin/ip6tables-nft-restore
1216
/usr/bin/update-alternatives --set ebtables /usr/sbin/ebtables-nft
17+
/usr/bin/update-alternatives --set ebtables-save /usr/sbin/ebtables-nft-save
18+
/usr/bin/update-alternatives --set ebtables-restore /usr/sbin/ebtables-nft-restore
1319
/usr/bin/update-alternatives --set arptables /usr/sbin/arptables-nft
1420
executable: /bin/bash
1521
become: yes

zuul.d/job-templates.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -72,8 +72,8 @@
7272
voting: true
7373
- ironic-tempest-ipa-wholedisk-bios-agent_ipmitool-tinyipa
7474
- openstacksdk-functional-devstack-networking
75-
- neutron-linuxbridge-tempest-plugin-scenario-nftables
76-
- neutron-ovs-tempest-plugin-scenario-iptables_hybrid-nftables
75+
- neutron-linuxbridge-tempest-plugin-nftables
76+
- neutron-ovs-tempest-plugin-iptables_hybrid-nftables
7777
- devstack-enforce-scope
7878
- openstack-tox-py39-with-oslo-master:
7979
timeout: 3600

0 commit comments

Comments
 (0)