From 2e4079becb785e1b948b9cd4ae97ca3ab846a9ef Mon Sep 17 00:00:00 2001 From: Rob Bradford Date: Thu, 22 Feb 2024 16:22:55 +0000 Subject: [PATCH] build: Add libc to matrix for x86-64 tests To reduce issues caused by flaky tests split the musl and glibc jobs into separate jobs. This means fewer jobs will need to be restarted for flaky tests. This will also increase CI throughput since the musl builds account for ~40% of the total CI time when run together with glibc. Signed-off-by: Rob Bradford --- .github/workflows/integration-x86-64.yaml | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/.github/workflows/integration-x86-64.yaml b/.github/workflows/integration-x86-64.yaml index c783801b8..4eecbaa62 100644 --- a/.github/workflows/integration-x86-64.yaml +++ b/.github/workflows/integration-x86-64.yaml @@ -6,7 +6,8 @@ jobs: strategy: fail-fast: false matrix: - runner: ["garm-jammy", "garm-jammy-amd"] + runner: ["garm-jammy", "garm-jammy-amd"] + libc: ["musl", "gnu"] if: github.event_name == 'pull_request' name: Tests (x86-64) runs-on: ${{ matrix.runner }} @@ -31,12 +32,6 @@ jobs: - name: Load openvswitch module run: sudo modprobe openvswitch - name: Run integration tests - run: scripts/dev_cli.sh tests --integration + run: scripts/dev_cli.sh tests --integration --libc ${{ matrix.libc }} - name: Run live-migration integration tests - run: scripts/dev_cli.sh tests --integration-live-migration - - name: Run unit tests (musl) - run: scripts/dev_cli.sh tests --unit --libc musl - - name: Run integration tests (musl) - run: scripts/dev_cli.sh tests --integration --libc musl - - name: Run live-migration integration tests (musl) - run: scripts/dev_cli.sh tests --integration-live-migration --libc musl \ No newline at end of file + run: scripts/dev_cli.sh tests --integration-live-migration --libc ${{ matrix.libc }}