perf cases: stop and flush firewalld, iptables and nftables

Signed-off-by: Wenli Quan <[email protected]>
autotest · Jul 29, 2024 · a94506e · a94506e
1 parent ca352a9
commit a94506e
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/generic/tests/cfg/netperf.cfg b/generic/tests/cfg/netperf.cfg
@@ -99,7 +99,7 @@
             devcon_dirname += "amd64"
     client_mtu_cmd = "ifconfig %s mtu %s"
     host_mtu_cmd = "ifconfig %s mtu %s"
-    env_setup_cmd = "systemctl stop firewalld.service || service iptables stop || iptables -F || nft flush ruleset;"
+    env_setup_cmd = "systemctl stop firewalld.service ; service iptables stop ; iptables -F ; nft flush ruleset;"
     env_setup_cmd += " echo 2 > /proc/sys/net/ipv4/conf/all/arp_ignore;"
     env_setup_cmd += " echo 0 > /sys/kernel/mm/ksm/run;"
     env_setup_cmd += " echo 0 > /proc/sys/kernel/watchdog;"

diff --git a/generic/tests/cfg/pktgen_perf.cfg b/generic/tests/cfg/pktgen_perf.cfg
@@ -16,7 +16,7 @@
     pkt_size = 64
     burst = 1
     pktgen_script = "pktgen_perf pktgen_sample01_simple pktgen_sample03_burst_single_flow pktgen_sample05_flow_per_thread"
-    disable_iptables_rules_cmd = "iptables -F || nft flush ruleset"
+    disable_iptables_rules_cmd = "iptables -F ; nft flush ruleset"
     start_vm = no
     variants:
         - @default:

diff --git a/qemu/tests/cfg/netperf_udp_perf.cfg b/qemu/tests/cfg/netperf_udp_perf.cfg
@@ -31,7 +31,7 @@
     host_tuned_profile = "tuned-adm profile virtual-host"
     client_tuned_profile = "tuned-adm profile virtual-host"
     server_tuned_profile = "tuned-adm profile virtual-guest"
-    env_setup_cmd = "systemctl stop firewalld.service || service iptables stop || iptables -F || nft flush ruleset;"
+    env_setup_cmd = "systemctl stop firewalld.service ; service iptables stop ; iptables -F ; nft flush ruleset;"
     env_setup_cmd += " echo 2 > /proc/sys/net/ipv4/conf/all/arp_ignore;"
     env_setup_cmd += " echo 0 > /sys/kernel/mm/ksm/run;"
     env_setup_cmd += " echo 0 > /proc/sys/kernel/watchdog;"

diff --git a/qemu/tests/cfg/pktgen_burst_test.cfg b/qemu/tests/cfg/pktgen_burst_test.cfg
@@ -16,5 +16,5 @@
     pkt_size = 64
     queues = 8
     pktgen_script = "pktgen_sample03_burst_single_flow"
-    disable_iptables_rules_cmd = "iptables -F || nft flush ruleset"
+    disable_iptables_rules_cmd = "iptables -F ; nft flush ruleset"
     burst = 3