unit test

Author: robbycochran

.github/workflows/collector-builder.yml

@@ -44,7 +44,7 @@ jobs:
               - .github/workflows/collector-builder.yml
 
   build-builder-image:
-    name: local builder image ${{ matrix.arch }}
+    name: Local builder image ${{ matrix.arch }}
     # Multiarch builds sometimes take for eeeeeeeeeever
     timeout-minutes: 480
     needs:
@@ -118,7 +118,7 @@ jobs:
             ansible/ci-build-builder.yml
 
   build-builder-image-remote:
-    name: remote builder image ${{ matrix.arch }}
+    name: Remote builder image ${{ matrix.arch }}
     # Multiarch builds sometimes take for eeeeeeeeeever
     timeout-minutes: 480
     needs:

.github/workflows/collector.yml

@@ -34,7 +34,7 @@ env:
 
 jobs:
   build-collector-image:
-    name: Build Collector
+    name: Local collector image ${{ matrix.arch }}
     strategy:
       matrix:
         arch: [amd64, arm64]
@@ -89,7 +89,7 @@ jobs:
 
   build-collector-image-remote:
     if: contains(inputs.include-arch-json, 's390x')
-    name: Build Collector
+    name: Remote collector image ${{ matrix.arch }}
     strategy:
       matrix:
         arch: [s390x]

.github/workflows/unit-tests.yml

@@ -13,49 +13,32 @@ on:
         required: true
         description: |
           JSON list of {arch,runner,remote} build configurations
-      cmake-flags-list-json:
-        type: string
-        required: false
-        default: "['-DCMAKE_BUILD_TYPE=Release','-DADDRESS_SANITIZER=ON -DCMAKE_BUILD_TYPE=Debug','-DUSE_VALGRIND=ON -DCMAKE_BUILD_TYPE=Debug']"
-        description: |
-          JSON list of cmake flags for unit tests
 
 jobs:
-  unit-tests-amd64:
-    if: contains(inputs.include-arch-json, 'amd64')
-    runs-on: ubuntu-24.04
+  unit-tests:
     container:
       image: quay.io/stackrox-io/collector-builder:${{ inputs.collector-builder-tag }}
     strategy:
+      fail-fast: false
       matrix:
-        cmake-flags: ${{ fromJSON(inputs.cmake-flags-list-json) }}
-    steps:
-      - uses: actions/checkout@v4
-        with:
-          submodules: true
-      - uses: ./.github/actions/run-unit-tests
-        with:
-          cmake-flags: ${{ matrix.cmake-flags }}
+        arch: [amd64, arm64]
+        cmake-flags:
+        - -DCMAKE_BUILD_TYPE=Release
+        - -DADDRESS_SANITIZER=ON -DCMAKE_BUILD_TYPE=Debug
+        - -DUSE_VALGRIND=ON -DCMAKE_BUILD_TYPE=Debug
+    runs-on: ${{ (matrix.arch == 'arm64' && 'ubuntu-22.04-arm') || 'ubuntu-22.04' }}
 
-  unit-tests-arm64:
-    if: contains(inputs.include-arch-json, 'arm64')
-    runs-on: ubuntu-24.04-arm
-    container:
-      image: quay.io/stackrox-io/collector-builder:${{ inputs.collector-builder-tag }}
-    strategy:
-      matrix:
-        cmake-flags: ${{ fromJSON(inputs.cmake-flags-list-json) }}
     steps:
       - uses: actions/checkout@v4
         with:
           submodules: true
+
       - uses: ./.github/actions/run-unit-tests
         with:
           cmake-flags: ${{ matrix.cmake-flags }}
 
-  unit-tests-coverage:
-    if: contains(inputs.include-arch-json, 'arm64')
-    runs-on: ubuntu-24.04-arm
+  coverage:
+    runs-on: ubuntu-24.04
     container:
       image: quay.io/stackrox-io/collector-builder:${{ inputs.collector-builder-tag }}
     steps: