From 2658a366ad61cfd3eb774dfe604cff706dd60c7f Mon Sep 17 00:00:00 2001 From: Victor Julien Date: Thu, 19 Feb 2026 10:41:49 +0000 Subject: [PATCH] qa: move live tests into qa/live dir They are not github specific. --- .github/workflows/builds.yml | 52 +++++++++---------- {.github/workflows => qa}/live/afp-ids.sh | 4 +- {.github/workflows => qa}/live/dpdk.sh | 4 +- .../live}/dpdk/suricata-null-ips.yaml | 0 {.github/workflows => qa}/live/icmp.rules | 0 {.github/workflows => qa}/live/icmp2.rules | 0 .../workflows => qa}/live/multi-tenant.sh | 4 +- .../live}/netns/afp-ips-netns-bond-bridge.sh | 2 +- .../live}/netns/afp-ips-netns-bond-bridge2.sh | 2 +- .../live}/netns/afp-ips-netns-bridge.sh | 2 +- .../live}/netns/drop-icmp.rules | 0 .../live}/netns/ips-netns-bond.yaml | 0 .../live}/netns/ips-netns-bond2.yaml | 0 .../live}/netns/ips-netns.yaml | 0 .../live}/netns/nfq-ips-netns-route.sh | 2 +- {.github/workflows => qa}/live/pcap.sh | 4 +- .../workflows => qa}/live/suricata-mt.yaml | 0 {.github/workflows => qa}/live/tenant-1.yaml | 0 18 files changed, 38 insertions(+), 38 deletions(-) rename {.github/workflows => qa}/live/afp-ids.sh (97%) rename {.github/workflows => qa}/live/dpdk.sh (93%) rename {.github/workflows => qa/live}/dpdk/suricata-null-ips.yaml (100%) rename {.github/workflows => qa}/live/icmp.rules (100%) rename {.github/workflows => qa}/live/icmp2.rules (100%) rename {.github/workflows => qa}/live/multi-tenant.sh (95%) rename {.github/workflows => qa/live}/netns/afp-ips-netns-bond-bridge.sh (99%) rename {.github/workflows => qa/live}/netns/afp-ips-netns-bond-bridge2.sh (99%) rename {.github/workflows => qa/live}/netns/afp-ips-netns-bridge.sh (99%) rename {.github/workflows => qa/live}/netns/drop-icmp.rules (100%) rename {.github/workflows => qa/live}/netns/ips-netns-bond.yaml (100%) rename {.github/workflows => qa/live}/netns/ips-netns-bond2.yaml (100%) rename {.github/workflows => qa/live}/netns/ips-netns.yaml (100%) rename {.github/workflows => qa/live}/netns/nfq-ips-netns-route.sh (99%) rename {.github/workflows => qa}/live/pcap.sh (98%) rename {.github/workflows => qa}/live/suricata-mt.yaml (100%) rename {.github/workflows => qa}/live/tenant-1.yaml (100%) diff --git a/.github/workflows/builds.yml b/.github/workflows/builds.yml index 9cc1f619f7..078a947afd 100644 --- a/.github/workflows/builds.yml +++ b/.github/workflows/builds.yml @@ -1869,12 +1869,12 @@ jobs: RUSTFLAGS: "-C instrument-coverage" # IDS config - run: | - ./.github/workflows/live/dpdk.sh "qa/live/dpdk/suricata-null-ids.yaml" + ./qa/live/dpdk.sh "qa/live/dpdk/suricata-null-ids.yaml" env: LLVM_PROFILE_FILE: "/tmp/dpdk-ids.profraw" # IPS config - run: | - ./.github/workflows/live/dpdk.sh ".github/workflows/dpdk/suricata-null-ips.yaml" + ./qa/live/dpdk.sh "qa/live/dpdk/suricata-null-ips.yaml" env: LLVM_PROFILE_FILE: "/tmp/dpdk-ips.profraw" # DPDK configuration checks @@ -1883,32 +1883,32 @@ jobs: LLVM_PROFILE_FILE: "/tmp/dpdk-testsuite-%p.profraw" # AF_PACKET tests - run: | - ./.github/workflows/live/afp-ids.sh "2" "autofp" + ./qa/live/afp-ids.sh "2" "autofp" env: LLVM_PROFILE_FILE: "/tmp/afp2-ids-autofp.profraw" - run: | - ./.github/workflows/live/afp-ids.sh "2" "workers" + ./qa/live/afp-ids.sh "2" "workers" env: LLVM_PROFILE_FILE: "/tmp/afp2-ids-workers.profraw" - run: | - ./.github/workflows/live/afp-ids.sh "3" "autofp" + ./qa/live/afp-ids.sh "3" "autofp" env: LLVM_PROFILE_FILE: "/tmp/afp3-ids-autofp.profraw" - run: | - ./.github/workflows/live/afp-ids.sh "3" "workers" + ./qa/live/afp-ids.sh "3" "workers" env: LLVM_PROFILE_FILE: "/tmp/afp3-ids-workers.profraw" # PCAP - run: | - ./.github/workflows/live/pcap.sh "autofp" + ./qa/live/pcap.sh "autofp" env: LLVM_PROFILE_FILE: "/tmp/pcap-autofp.profraw" - run: | - ./.github/workflows/live/pcap.sh "single" + ./qa/live/pcap.sh "single" env: LLVM_PROFILE_FILE: "/tmp/pcap-single.profraw" - run: | - ./.github/workflows/live/multi-tenant.sh "autofp" + ./qa/live/multi-tenant.sh "autofp" env: LLVM_PROFILE_FILE: "/tmp/mt-autofp.profraw" - run: llvm-profdata-19 merge -o default.profdata $(find /tmp/ -name '*.profraw') @@ -2117,37 +2117,37 @@ jobs: CXXFLAGS: "-fprofile-instr-generate -fcoverage-mapping -O0" - run: | - ./.github/workflows/netns/afp-ips-netns-bridge.sh "2" "workers" ".github/workflows/netns/ips-netns.yaml" + ./qa/live/netns/afp-ips-netns-bridge.sh "2" "workers" "qa/live/netns/ips-netns.yaml" env: LLVM_PROFILE_FILE: "/tmp/afp-ips.profraw" - run: llvm-profdata-19 merge -o afp-ips.profdata /tmp/afp-ips.profraw - run: | - ./.github/workflows/netns/afp-ips-netns-bridge.sh "2" "autofp" ".github/workflows/netns/ips-netns.yaml" + ./qa/live/netns/afp-ips-netns-bridge.sh "2" "autofp" "qa/live/netns/ips-netns.yaml" env: LLVM_PROFILE_FILE: "/tmp/afp-ips-autofp.profraw" - run: llvm-profdata-19 merge -o afp-ips-autofp.profdata /tmp/afp-ips-autofp.profraw - run: | - ./.github/workflows/netns/afp-ips-netns-bond-bridge.sh "2" "workers" ".github/workflows/netns/ips-netns-bond.yaml" + ./qa/live/netns/afp-ips-netns-bond-bridge.sh "2" "workers" "qa/live/netns/ips-netns-bond.yaml" env: LLVM_PROFILE_FILE: "/tmp/afp-ips-bond1.profraw" - run: llvm-profdata-19 merge -o afp-ips-bond1.profdata /tmp/afp-ips-bond1.profraw - run: | - ./.github/workflows/netns/afp-ips-netns-bond-bridge2.sh "2" "workers" ".github/workflows/netns/ips-netns-bond2.yaml" + ./qa/live/netns/afp-ips-netns-bond-bridge2.sh "2" "workers" "qa/live/netns/ips-netns-bond2.yaml" env: LLVM_PROFILE_FILE: "/tmp/afp-ips-bond2.profraw" - run: llvm-profdata-19 merge -o afp-ips-bond2.profdata /tmp/afp-ips-bond2.profraw - run: | - ./.github/workflows/netns/nfq-ips-netns-route.sh "autofp" ".github/workflows/netns/ips-netns.yaml" + ./qa/live/netns/nfq-ips-netns-route.sh "autofp" "qa/live/netns/ips-netns.yaml" env: LLVM_PROFILE_FILE: "/tmp/nfq-ips.profraw" - run: llvm-profdata-19 merge -o nfq-ips.profdata /tmp/nfq-ips.profraw - run: | - ./.github/workflows/netns/nfq-ips-netns-route.sh "workers" ".github/workflows/netns/ips-netns.yaml" + ./qa/live/netns/nfq-ips-netns-route.sh "workers" "qa/live/netns/ips-netns.yaml" env: LLVM_PROFILE_FILE: "/tmp/nfq-ips-workers.profraw" - run: llvm-profdata-19 merge -o nfq-ips-workers.profdata /tmp/nfq-ips-workers.profraw @@ -2262,27 +2262,27 @@ jobs: CC: "clang-18" # IDS config - run: | - ./.github/workflows/live/dpdk.sh "qa/live/dpdk/suricata-null-ids.yaml" + ./qa/live/dpdk.sh "qa/live/dpdk/suricata-null-ids.yaml" # IPS config - run: | - ./.github/workflows/live/dpdk.sh ".github/workflows/dpdk/suricata-null-ips.yaml" + ./qa/live/dpdk.sh "qa/live/dpdk/suricata-null-ips.yaml" # DPDK configuration checks - run: ./qa/live/dpdk/dpdk-testsuite.sh # AF_PACKET tests - run: | - ./.github/workflows/live/afp-ids.sh "2" "autofp" + ./qa/live/afp-ids.sh "2" "autofp" - run: | - ./.github/workflows/live/afp-ids.sh "2" "workers" + ./qa/live/afp-ids.sh "2" "workers" - run: | - ./.github/workflows/live/afp-ids.sh "3" "autofp" + ./qa/live/afp-ids.sh "3" "autofp" - run: | - ./.github/workflows/live/afp-ids.sh "3" "workers" + ./qa/live/afp-ids.sh "3" "workers" - run: | - ./.github/workflows/live/pcap.sh "autofp" + ./qa/live/pcap.sh "autofp" - run: | - ./.github/workflows/live/pcap.sh "single" + ./qa/live/pcap.sh "single" - run: | - ./.github/workflows/live/multi-tenant.sh "autofp" + ./qa/live/multi-tenant.sh "autofp" ubuntu-24-04-cov-fuzz: name: Ubuntu 24.04 (fuzz corpus coverage) @@ -2954,10 +2954,10 @@ jobs: - run: make check # IDS config - run: | - ./.github/workflows/live/dpdk.sh "qa/live/dpdk/suricata-null-ids.yaml" + ./qa/live/dpdk.sh "qa/live/dpdk/suricata-null-ids.yaml" # IPS config - run: | - ./.github/workflows/live/dpdk.sh ".github/workflows/dpdk/suricata-null-ips.yaml" + ./qa/live/dpdk.sh "qa/live/dpdk/suricata-null-ips.yaml" # DPDK configuration checks - run: ./qa/live/dpdk/dpdk-testsuite.sh diff --git a/.github/workflows/live/afp-ids.sh b/qa/live/afp-ids.sh similarity index 97% rename from .github/workflows/live/afp-ids.sh rename to qa/live/afp-ids.sh index 5cb79b065b..541ca982c1 100755 --- a/.github/workflows/live/afp-ids.sh +++ b/qa/live/afp-ids.sh @@ -46,7 +46,7 @@ ping $GW & PINGPID=$! # set first rule file -cp .github/workflows/live/icmp.rules suricata.rules +cp qa/live/icmp.rules suricata.rules if [ $TPACKET = "2" ]; then V3=true @@ -93,7 +93,7 @@ fi echo "SURIPID $SURIPID PINGPID $PINGPID" # set second rule file for the reload -cp .github/workflows/live/icmp2.rules suricata.rules +cp qa/live/icmp2.rules suricata.rules # trigger the reload JSON=$(${SURICATASC} -c "iface-list" /var/run/suricata/suricata-command.socket) diff --git a/.github/workflows/live/dpdk.sh b/qa/live/dpdk.sh similarity index 93% rename from .github/workflows/live/dpdk.sh rename to qa/live/dpdk.sh index f11a69631b..83c0440b21 100755 --- a/.github/workflows/live/dpdk.sh +++ b/qa/live/dpdk.sh @@ -30,7 +30,7 @@ fi RES=0 # set first rule file -cp .github/workflows/live/icmp.rules suricata.rules +cp qa/live/icmp.rules suricata.rules # Start Suricata, SIGINT after 120 secords. Will close it earlier through # the unix socket. @@ -50,7 +50,7 @@ fi echo "SURIPID $SURIPID" # set second rule file for the reload -cp .github/workflows/live/icmp2.rules suricata.rules +cp qa/live/icmp2.rules suricata.rules # trigger the reload ${SURICATASC} -c "reload-rules" /var/run/suricata/suricata-command.socket diff --git a/.github/workflows/dpdk/suricata-null-ips.yaml b/qa/live/dpdk/suricata-null-ips.yaml similarity index 100% rename from .github/workflows/dpdk/suricata-null-ips.yaml rename to qa/live/dpdk/suricata-null-ips.yaml diff --git a/.github/workflows/live/icmp.rules b/qa/live/icmp.rules similarity index 100% rename from .github/workflows/live/icmp.rules rename to qa/live/icmp.rules diff --git a/.github/workflows/live/icmp2.rules b/qa/live/icmp2.rules similarity index 100% rename from .github/workflows/live/icmp2.rules rename to qa/live/icmp2.rules diff --git a/.github/workflows/live/multi-tenant.sh b/qa/live/multi-tenant.sh similarity index 95% rename from .github/workflows/live/multi-tenant.sh rename to qa/live/multi-tenant.sh index b668276400..296912589a 100755 --- a/.github/workflows/live/multi-tenant.sh +++ b/qa/live/multi-tenant.sh @@ -65,8 +65,8 @@ ping $GW & PINGPID=$! # set first rule file -cp .github/workflows/live/icmp.rules suricata.rules -cp .github/workflows/live/{suricata-mt.yaml,tenant-1.yaml} . +cp qa/live/icmp.rules suricata.rules +cp qa/live/{suricata-mt.yaml,tenant-1.yaml} . # Start Suricata, SIGINT after 120 secords. Will close it earlier through # the unix socket. diff --git a/.github/workflows/netns/afp-ips-netns-bond-bridge.sh b/qa/live/netns/afp-ips-netns-bond-bridge.sh similarity index 99% rename from .github/workflows/netns/afp-ips-netns-bond-bridge.sh rename to qa/live/netns/afp-ips-netns-bond-bridge.sh index dedc80bb6b..80d5fde4c7 100755 --- a/.github/workflows/netns/afp-ips-netns-bond-bridge.sh +++ b/qa/live/netns/afp-ips-netns-bond-bridge.sh @@ -176,7 +176,7 @@ ip netns exec $dutns ip link set bond-$dutserverif up echo "* setup dut interfaces... done" # set first rule file -cp .github/workflows/netns/drop-icmp.rules suricata.rules +cp qa/live/netns/drop-icmp.rules suricata.rules RULES="suricata.rules" echo "* starting Suricata in the \"dut\" namespace..." diff --git a/.github/workflows/netns/afp-ips-netns-bond-bridge2.sh b/qa/live/netns/afp-ips-netns-bond-bridge2.sh similarity index 99% rename from .github/workflows/netns/afp-ips-netns-bond-bridge2.sh rename to qa/live/netns/afp-ips-netns-bond-bridge2.sh index dfa4aafe63..2a61dd91dc 100755 --- a/.github/workflows/netns/afp-ips-netns-bond-bridge2.sh +++ b/qa/live/netns/afp-ips-netns-bond-bridge2.sh @@ -253,7 +253,7 @@ ip netns exec $dutns ip link set bond-$dutserverif2 up echo "* setup dut interfaces... done" # set first rule file -cp .github/workflows/netns/drop-icmp.rules suricata.rules +cp qa/live/netns/drop-icmp.rules suricata.rules RULES="suricata.rules" echo "* starting Suricata in the \"dut\" namespace..." diff --git a/.github/workflows/netns/afp-ips-netns-bridge.sh b/qa/live/netns/afp-ips-netns-bridge.sh similarity index 99% rename from .github/workflows/netns/afp-ips-netns-bridge.sh rename to qa/live/netns/afp-ips-netns-bridge.sh index 5de411f9e3..856220323f 100755 --- a/.github/workflows/netns/afp-ips-netns-bridge.sh +++ b/qa/live/netns/afp-ips-netns-bridge.sh @@ -132,7 +132,7 @@ ip netns exec $dutns ip link set ptp-$dutserverif up echo "* setup dut interfaces... done" # set first rule file -cp .github/workflows/netns/drop-icmp.rules suricata.rules +cp qa/live/netns/drop-icmp.rules suricata.rules RULES="suricata.rules" echo "* starting Suricata in the \"dut\" namespace..." diff --git a/.github/workflows/netns/drop-icmp.rules b/qa/live/netns/drop-icmp.rules similarity index 100% rename from .github/workflows/netns/drop-icmp.rules rename to qa/live/netns/drop-icmp.rules diff --git a/.github/workflows/netns/ips-netns-bond.yaml b/qa/live/netns/ips-netns-bond.yaml similarity index 100% rename from .github/workflows/netns/ips-netns-bond.yaml rename to qa/live/netns/ips-netns-bond.yaml diff --git a/.github/workflows/netns/ips-netns-bond2.yaml b/qa/live/netns/ips-netns-bond2.yaml similarity index 100% rename from .github/workflows/netns/ips-netns-bond2.yaml rename to qa/live/netns/ips-netns-bond2.yaml diff --git a/.github/workflows/netns/ips-netns.yaml b/qa/live/netns/ips-netns.yaml similarity index 100% rename from .github/workflows/netns/ips-netns.yaml rename to qa/live/netns/ips-netns.yaml diff --git a/.github/workflows/netns/nfq-ips-netns-route.sh b/qa/live/netns/nfq-ips-netns-route.sh similarity index 99% rename from .github/workflows/netns/nfq-ips-netns-route.sh rename to qa/live/netns/nfq-ips-netns-route.sh index 42f96db1eb..bbee1229be 100755 --- a/.github/workflows/netns/nfq-ips-netns-route.sh +++ b/qa/live/netns/nfq-ips-netns-route.sh @@ -151,7 +151,7 @@ ip netns exec $dutns iptables -I FORWARD 1 -j NFQUEUE echo "* enabling forwarding in the dut... done" # set first rule file -cp .github/workflows/netns/drop-icmp.rules suricata.rules +cp qa/live/netns/drop-icmp.rules suricata.rules RULES="suricata.rules" echo "* starting Suricata in the \"dut\" namespace..." diff --git a/.github/workflows/live/pcap.sh b/qa/live/pcap.sh similarity index 98% rename from .github/workflows/live/pcap.sh rename to qa/live/pcap.sh index f671e5bb50..06f59ee896 100755 --- a/.github/workflows/live/pcap.sh +++ b/qa/live/pcap.sh @@ -45,7 +45,7 @@ ping $GW & PINGPID=$! # set first rule file -cp .github/workflows/live/icmp.rules suricata.rules +cp qa/live/icmp.rules suricata.rules # Start Suricata, SIGINT after 120 secords. Will close it earlier through # the unix socket. @@ -107,7 +107,7 @@ fi echo "SURIPID $SURIPID PINGPID $PINGPID" # set second rule file for the reload -cp .github/workflows/live/icmp2.rules suricata.rules +cp qa/live/icmp2.rules suricata.rules # trigger the reload JSON=$(${SURICATASC} -c "iface-list" /var/run/suricata/suricata-command.socket) diff --git a/.github/workflows/live/suricata-mt.yaml b/qa/live/suricata-mt.yaml similarity index 100% rename from .github/workflows/live/suricata-mt.yaml rename to qa/live/suricata-mt.yaml diff --git a/.github/workflows/live/tenant-1.yaml b/qa/live/tenant-1.yaml similarity index 100% rename from .github/workflows/live/tenant-1.yaml rename to qa/live/tenant-1.yaml