From daa0d1c5a2bec7b78837686eff3ea052f0c45bd7 Mon Sep 17 00:00:00 2001 From: Rodolfo Alonso Hernandez Date: Tue, 10 Oct 2023 17:13:59 +0000 Subject: [PATCH] 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 --- roles/nftables/tasks/main.yaml | 6 ++++++ zuul.d/job-templates.yaml | 4 ++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/roles/nftables/tasks/main.yaml b/roles/nftables/tasks/main.yaml index 3af97edacf0..c86bbfe664f 100644 --- a/roles/nftables/tasks/main.yaml +++ b/roles/nftables/tasks/main.yaml @@ -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 diff --git a/zuul.d/job-templates.yaml b/zuul.d/job-templates.yaml index 6263c0c63f7..9e74fa8a776 100644 --- a/zuul.d/job-templates.yaml +++ b/zuul.d/job-templates.yaml @@ -115,8 +115,8 @@ voting: true - ironic-tempest-ipa-wholedisk-bios-agent_ipmitool-tinyipa - openstacksdk-functional-devstack-networking - - 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 - openstack-tox-py39-with-oslo-master: timeout: 3600