Skip to content

Commit c1d65c4

Browse files
jasonishjasonish
committed
ci: allow suricata-verify failures
1 parent 34dc982 commit c1d65c4

1 file changed

Lines changed: 38 additions & 38 deletions

File tree

‎.github/workflows/builds.yml‎

Lines changed: 38 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -755,7 +755,7 @@ jobs:
755755
- name: Check if the nDPI plugin was installed
756756
run: test -e /usr/local/lib/suricata/ndpi.so
757757
- run: tar xf prep/suricata-verify.tar.gz
758-
# - run: python3 ./suricata-verify/run.py -q --debug-failed
758+
- run: python3 ./suricata-verify/run.py -q --debug-failed || true
759759
- run: suricata-update -V
760760
- run: suricatasc -h
761761
# Test build after clean.
@@ -847,8 +847,8 @@ jobs:
847847
- name: Extracting suricata-verify
848848
run: tar xf prep/suricata-verify.tar.gz
849849
- run: rm -r prep
850-
# - name: Running suricata-verify
851-
# run: python3 ./suricata-verify/run.py -q --debug-failed --aggressive-cleanup
850+
- name: Running suricata-verify
851+
run: python3 ./suricata-verify/run.py -q --debug-failed --aggressive-cleanup || true
852852
- run: llvm-profdata merge -o default.profdata $(find suricata-verify/tests/ -name '*.profraw')
853853
- run: llvm-cov show ./src/suricata -instr-profile=default.profdata --show-instantiations --ignore-filename-regex="^/root/.*" > coverage.txt
854854
- name: Upload coverage to Codecov
@@ -938,8 +938,8 @@ jobs:
938938
- run: ./src/suricata -u -l .
939939
- name: Extracting suricata-verify
940940
run: tar xf prep/suricata-verify.tar.gz
941-
# - name: Running suricata-verify
942-
# run: python3 ./suricata-verify/run.py -q --debug-failed
941+
- name: Running suricata-verify
942+
run: python3 ./suricata-verify/run.py -q --debug-failed || true
943943
# Now install and make sure headers and libraries aren't
944944
# installed until requested.
945945
- run: make install
@@ -1033,8 +1033,8 @@ jobs:
10331033
- run: ./src/suricata -u -l .
10341034
- name: Extracting suricata-verify
10351035
run: tar xf prep/suricata-verify.tar.gz
1036-
# - name: Running suricata-verify
1037-
# run: python3 ./suricata-verify/run.py -q --debug-failed
1036+
- name: Running suricata-verify
1037+
run: python3 ./suricata-verify/run.py -q --debug-failed || true
10381038
# Now install and make sure headers and libraries aren't
10391039
# installed until requested.
10401040
- run: make install
@@ -1144,8 +1144,8 @@ jobs:
11441144
- run: src/suricata --build-info | grep -E "JA4 support:\s+no" &> /dev/null
11451145
working-directory: /home/suricata/suricata
11461146

1147-
# - run: sudo -u suricata -s python3 ./suricata-verify/run.py -q --debug-failed
1148-
# working-directory: /home/suricata/suricata
1147+
- run: sudo -u suricata -s python3 ./suricata-verify/run.py -q --debug-failed || true
1148+
working-directory: /home/suricata/suricata
11491149

11501150
- run: src/suricata -h | grep '\-\-list\-app\-layer\-hooks' &> /dev/null
11511151
working-directory: /home/suricata/suricata
@@ -1338,7 +1338,7 @@ jobs:
13381338
- run: ./configure --enable-unittests --enable-coccinelle
13391339
- run: make -j ${{ env.CPUS }}
13401340
- run: CONCURRENCY_LEVEL=${{ env.CPUS }} make check
1341-
# - run: python3 ./suricata-verify/run.py -q --debug-failed
1341+
- run: python3 ./suricata-verify/run.py -q --debug-failed || true
13421342
- run: make install
13431343
- run: make install-headers
13441344
- run: make install-library
@@ -1412,9 +1412,9 @@ jobs:
14121412
- run: CARGO=cargo-1.82 RUSTC=rustc-1.82 RUSTDOC=rustdoc-1.82 ./configure --enable-unittests
14131413
- run: make -j ${{ env.CPUS }}
14141414
- run: make check
1415-
# - run: python3 ./suricata-verify/run.py -q --debug-failed
1416-
# env:
1417-
# CARGO: cargo-1.82
1415+
- run: python3 ./suricata-verify/run.py -q --debug-failed || true
1416+
env:
1417+
CARGO: cargo-1.82
14181418
- run: make install
14191419
- run: make install-headers
14201420
- run: make install-library
@@ -1655,10 +1655,10 @@ jobs:
16551655
CC: "clang-15"
16561656
CXX: "clang++-15"
16571657
RUSTFLAGS: "-C instrument-coverage"
1658-
# - run: |
1659-
# ./qa/unix.sh "suricata-verify/"
1660-
# env:
1661-
# LLVM_PROFILE_FILE: "/tmp/unix.profraw"
1658+
- run: |
1659+
./qa/unix.sh "suricata-verify/"
1660+
env:
1661+
LLVM_PROFILE_FILE: "/tmp/unix.profraw"
16621662
- run: llvm-profdata-15 merge -o default.profdata $(find /tmp/ -name '*.profraw')
16631663
- run: llvm-cov-15 show ./src/suricata -instr-profile=default.profdata --show-instantiations --ignore-filename-regex="^/root/.*" > coverage.txt
16641664
- name: Upload coverage to Codecov
@@ -1894,8 +1894,8 @@ jobs:
18941894
- run: make -j ${{ env.CPUS }}
18951895
env:
18961896
CC: "clang-18"
1897-
# - run: |
1898-
# ./qa/unix.sh "suricata-verify/"
1897+
- run: |
1898+
./qa/unix.sh "suricata-verify/"
18991899
19001900
ubuntu-latest-namespace-ips:
19011901
name: Ubuntu 24.04 (afpacket IPS tests in namespaces)
@@ -2316,8 +2316,8 @@ jobs:
23162316
- run: make dist
23172317
- name: Extracting suricata-verify
23182318
run: tar xf prep/suricata-verify.tar.gz
2319-
# - name: Running suricata-verify
2320-
# run: python3 ./suricata-verify/run.py -q --debug-failed
2319+
- name: Running suricata-verify
2320+
run: python3 ./suricata-verify/run.py -q --debug-failed || true
23212321
# Now install and make sure headers and libraries aren't install
23222322
# until requested.
23232323
- run: make install
@@ -2477,8 +2477,8 @@ jobs:
24772477
- run: make check
24782478
- name: Extracting suricata-verify
24792479
run: tar xf prep/suricata-verify.tar.gz
2480-
# - name: Running suricata-verify
2481-
# run: python3 ./suricata-verify/run.py -q --debug-failed
2480+
- name: Running suricata-verify
2481+
run: python3 ./suricata-verify/run.py -q --debug-failed || true
24822482

24832483
# test build with afl and fuzztargets
24842484
ubuntu-22-04-fuzz:
@@ -2871,8 +2871,8 @@ jobs:
28712871
- name: Building Rust documentation
28722872
run: make doc
28732873
working-directory: rust
2874-
# - name: Running suricata-verify
2875-
# run: python3 ./suricata-verify/run.py -q --debug-failed
2874+
- name: Running suricata-verify
2875+
run: python3 ./suricata-verify/run.py -q --debug-failed || true
28762876
- run: make install
28772877
- run: suricata-update -V
28782878
- run: suricatasc -h
@@ -2960,8 +2960,8 @@ jobs:
29602960
- name: Building Rust documentation
29612961
run: make doc
29622962
working-directory: rust
2963-
# - name: Running suricata-verify
2964-
# run: python3 ./suricata-verify/run.py -q --debug-failed
2963+
- name: Running suricata-verify
2964+
run: python3 ./suricata-verify/run.py -q --debug-failed || true
29652965
- run: make install
29662966
- run: suricata-update -V
29672967
- run: suricatasc -h
@@ -3127,8 +3127,8 @@ jobs:
31273127
- name: Building Rust documentation
31283128
run: make doc
31293129
working-directory: rust
3130-
# - name: Running suricata-verify
3131-
# run: python3 ./suricata-verify/run.py -q --debug-failed
3130+
- name: Running suricata-verify
3131+
run: python3 ./suricata-verify/run.py -q --debug-failed || true
31323132
- run: make install
31333133
- run: suricata-update -V
31343134
- run: suricatasc -h
@@ -3200,8 +3200,8 @@ jobs:
32003200
- run: make -j ${{ env.CPUS }}
32013201
- run: make check
32023202
- run: tar xf prep/suricata-verify.tar.gz
3203-
# - name: Running suricata-verify
3204-
# run: python3 ./suricata-verify/run.py -q --debug-failed
3203+
- name: Running suricata-verify
3204+
run: python3 ./suricata-verify/run.py -q --debug-failed || true
32053205
- run: make install
32063206
- run: suricata-update -V
32073207
- run: suricatasc -h
@@ -3256,10 +3256,10 @@ jobs:
32563256
- run: CPATH="$HOMEBREW_PREFIX/include:$CPATH" LIBRARY_PATH="$HOMEBREW_PREFIX/lib:$LIBRARY_PATH" PATH="/opt/homebrew/opt/libtool/libexec/gnubin:$PATH" make -j2
32573257
- run: CPATH="$HOMEBREW_PREFIX/include:$CPATH" LIBRARY_PATH="$HOMEBREW_PREFIX/lib:$LIBRARY_PATH" PATH="/opt/homebrew/opt/libtool/libexec/gnubin:$PATH" make check
32583258
- run: tar xf prep/suricata-verify.tar.gz
3259-
# - name: Running suricata-verify
3260-
# run: |
3261-
# . ./testenv/bin/activate
3262-
# python3 ./suricata-verify/run.py -q --debug-failed
3259+
- name: Running suricata-verify
3260+
run: |
3261+
. ./testenv/bin/activate
3262+
python3 ./suricata-verify/run.py -q --debug-failed || true
32633263
- run: CPATH="$HOMEBREW_PREFIX/include:$CPATH" LIBRARY_PATH="$HOMEBREW_PREFIX/lib:$LIBRARY_PATH" PATH="/opt/homebrew/opt/libtool/libexec/gnubin:$PATH" CFLAGS="${DEFAULT_CFLAGS}" make install
32643264
- name: Check Suricata-Update
32653265
run: |
@@ -3326,7 +3326,7 @@ jobs:
33263326
./src/suricata --build-info
33273327
./src/suricata -u -l .
33283328
# need cwd in path due to npcap dlls (see above)
3329-
# PATH="$PATH:$(pwd)" python3 ./suricata-verify/run.py -q --debug-failed
3329+
PATH="$PATH:$(pwd)" python3 ./suricata-verify/run.py -q --debug-failed || true
33303330
- run: make install
33313331
- run: suricata-update -V
33323332

@@ -3373,7 +3373,7 @@ jobs:
33733373
run: |
33743374
./src/suricata --build-info
33753375
./src/suricata -u -l .
3376-
# python3 ./suricata-verify/run.py -q --debug-failed
3376+
python3 ./suricata-verify/run.py -q --debug-failed || true
33773377
- run: make install
33783378
- run: suricata-update -V
33793379

@@ -3431,7 +3431,7 @@ jobs:
34313431
run: |
34323432
./src/suricata --build-info
34333433
./src/suricata -u -l .
3434-
# python3 ./suricata-verify/run.py -q --debug-failed
3434+
python3 ./suricata-verify/run.py -q --debug-failed || true
34353435
- run: make install
34363436
- run: suricata-update -V
34373437

0 commit comments

Comments
 (0)