Improve CI stability (#2079)

Author: seladb

.github/workflows/build_and_test.yml

@@ -9,7 +9,7 @@ on:
 
 env:
   BUILD_DIR: Dist
-  GCOVR_FLAGS: --gcov-ignore-parse-errors --exclude-throw-branches --filter Common --filter Pcap --filter Packet --xml
+  GCOVR_FLAGS: --gcov-ignore-errors all --gcov-ignore-parse-errors all --merge-mode-functions=separate --exclude-throw-branches --filter Common --filter Pcap --filter Packet --xml
   CCACHE_DIR: ${{ github.workspace }}/.ccache
   CPPCHECK_VERSION: 2.9
 
@@ -57,6 +57,7 @@ jobs:
     runs-on: ${{ matrix.runner }}
     container: seladb/${{ matrix.image }}
     strategy:
+      fail-fast: false
       matrix:
         include: # Check the images at https://github.com/seladb/PcapPlusPlus-DockerImages
           - runner: ubuntu-latest
@@ -73,12 +74,15 @@ jobs:
           - runner: ubuntu-latest
             image: ubuntu2004
             config-zstd: OFF
+            gcovr-version: 8.2
           - runner: ubuntu-latest
             image: rhel94
             config-zstd: OFF
+            gcovr-version: 8.5
           - runner: ubuntu-latest
             image: ubuntu2004-zstd
             config-zstd: ON
+            gcovr-version: 8.2
           - runner: ubuntu-latest
             image: fedora42
             config-zstd: OFF
@@ -157,7 +161,7 @@ jobs:
       - name: Create Cobertura Report
         run: |
           . .venv/bin/activate
-          python3 -m pip install gcovr==8.2
+          python3 -m pip install gcovr==${{ matrix.gcovr-version || '8.6' }}
           gcovr -v -r . ${{ matrix.additional-gcov-flags }} $GCOVR_FLAGS -o coverage.xml
 
       - name: Upload Coverage Results
@@ -227,7 +231,7 @@ jobs:
       - name: Create Cobertura Report
         run: |
           . .venv/bin/activate
-          python3 -m pip install gcovr==8.2
+          python3 -m pip install gcovr==8.6
           gcovr -v -r . $GCOVR_FLAGS -o coverage.xml
 
       - name: Upload Coverage Results
@@ -530,7 +534,7 @@ jobs:
       - name: Create Cobertura Report
         if: ${{ matrix.host-arch == matrix.arch }}
         run: |
-          python3 -m pip install gcovr==8.2
+          python3 -m pip install gcovr==8.6
           gcovr -v -r . $GCOVR_FLAGS -o coverage.xml
 
       - name: Upload Coverage Results
@@ -651,7 +655,7 @@ jobs:
           python -m pytest --root-path=../../Dist/examples_bin
 
       - name: Install Coverage Requirements
-        run: python3 -m pip install gcovr==8.2
+        run: python3 -m pip install gcovr==8.6
 
       - name: Process Coverage Files
         shell: msys2 {0}
@@ -972,7 +976,7 @@ jobs:
 
       - name: Create Cobertura Report
         run: |
-          python -m pip install gcovr==8.2
+          python -m pip install gcovr==8.6
           gcovr -v -r . $GCOVR_FLAGS -o coverage.xml
 
       - name: Upload Coverage Results

ci/run_tests/run_tests.py

@@ -12,11 +12,17 @@
 
 
 @contextmanager
-def tcp_replay_worker(interface: str, tcpreplay_dir: str):
-    tcpreplay_proc = subprocess.Popen(
-        ["tcpreplay", "-i", interface, "--mbps=10", "-l", "0", PCAP_FILE_PATH],
-        cwd=tcpreplay_dir,
-    )
+def tcp_replay_worker(interface: str, tcpreplay_dir: str, use_sudo: bool):
+    cmd_line = ["sudo"] * use_sudo + [
+        "tcpreplay",
+        "-i",
+        interface,
+        "--mbps=10",
+        "-l",
+        "0",
+        PCAP_FILE_PATH,
+    ]
+    tcpreplay_proc = subprocess.Popen(cmd_line, cwd=tcpreplay_dir)
     try:
         yield tcpreplay_proc
     finally:
@@ -51,10 +57,14 @@ def run_pcap_tests(self, interface: str, tcpreplay_dir: str, args: list[str]):
         exe_path = self.build_dir / self.pcap_test_path
         work_dir = exe_path.parent
 
-        cmd_line = ["sudo"] if self.use_sudo else []
-        cmd_line += [str(exe_path.absolute()), "-i", ip_address, *args]
+        cmd_line = ["sudo"] * self.use_sudo + [
+            str(exe_path.absolute()),
+            "-i",
+            ip_address,
+            *args,
+        ]
 
-        with tcp_replay_worker(interface, tcpreplay_dir):
+        with tcp_replay_worker(interface, tcpreplay_dir, self.use_sudo):
             completed_process = subprocess.run(cmd_line, cwd=str(work_dir))
             if completed_process.returncode != 0:
                 raise RuntimeError(