From b39a03ddb2f965a06117816d75518bc6e93d27fb Mon Sep 17 00:00:00 2001 From: Matias Elo Date: Thu, 26 Sep 2024 15:30:45 +0300 Subject: [PATCH] github_ci: simplify config Update pipeline config. Signed-off-by: Matias Elo --- .github/workflows/ci-pipeline-arm64.yml | 49 +++++++++++++------------ 1 file changed, 25 insertions(+), 24 deletions(-) diff --git a/.github/workflows/ci-pipeline-arm64.yml b/.github/workflows/ci-pipeline-arm64.yml index 1d50422ce2..147363dc80 100644 --- a/.github/workflows/ci-pipeline-arm64.yml +++ b/.github/workflows/ci-pipeline-arm64.yml @@ -1,8 +1,8 @@ name: CI arm64 # github.repository has been used to ensure CI is only run on the repo where -# self-hosted runners are installed. This will prevent ah-ubuntu_22_04-c7g_2x-50 -# CI failing on forks. +# self-hosted runners are installed. This will prevent CI pipeline failing on +# forks. on: [push, pull_request, merge_group] env: @@ -10,11 +10,12 @@ env: CC: gcc CONTAINER_NAMESPACE: ghcr.io/opendataplane/odp-docker-images OS: ubuntu_20.04 + RUNNER: ah-ubuntu_22_04-c7g_2x-50 jobs: Build_gcc: if: ${{ github.repository == 'OpenDataPlane/odp' }} - runs-on: ah-ubuntu_22_04-c7g_2x-50 + runs-on: $env.RUNNER strategy: fail-fast: false matrix: @@ -36,7 +37,7 @@ jobs: Build_clang: if: ${{ github.repository == 'OpenDataPlane/odp' }} - runs-on: ah-ubuntu_22_04-c7g_2x-50 + runs-on: "$env.RUNNER" strategy: fail-fast: false matrix: @@ -60,7 +61,7 @@ jobs: Build_static_u22: if: ${{ github.repository == 'OpenDataPlane/odp' }} - runs-on: ah-ubuntu_22_04-c7g_2x-50 + runs-on: ${{ env.RUNNER }} env: OS: ubuntu_22.04 CONF: "--disable-shared --without-openssl --without-pcap" @@ -78,7 +79,7 @@ jobs: Build_OS: if: ${{ github.repository == 'OpenDataPlane/odp' }} - runs-on: ah-ubuntu_22_04-c7g_2x-50 + runs-on: $env.RUNNER strategy: fail-fast: false matrix: @@ -93,7 +94,7 @@ jobs: Build_gcc_u22: if: ${{ github.repository == 'OpenDataPlane/odp' }} - runs-on: ah-ubuntu_22_04-c7g_2x-50 + runs-on: $env.RUNNER env: OS: ubuntu_22.04 strategy: @@ -110,7 +111,7 @@ jobs: Build_out-of-tree: if: ${{ github.repository == 'OpenDataPlane/odp' }} - runs-on: ah-ubuntu_22_04-c7g_2x-50 + runs-on: $env.RUNNER steps: - uses: actions/checkout@v4 - run: sudo docker run -i -v `pwd`:/odp --privileged --shm-size 8g -e CC="${CC}" @@ -120,7 +121,7 @@ jobs: Build_XDP: if: ${{ github.repository == 'OpenDataPlane/odp' }} - runs-on: ah-ubuntu_22_04-c7g_2x-50 + runs-on: $env.RUNNER env: CONF: "--enable-xdp" OS: ubuntu_22.04 @@ -137,7 +138,7 @@ jobs: Run_distcheck: if: ${{ github.repository == 'OpenDataPlane/odp' }} - runs-on: ah-ubuntu_22_04-c7g_2x-50 + runs-on: $env.RUNNER strategy: fail-fast: false matrix: @@ -151,7 +152,7 @@ jobs: Run_gcc: if: ${{ github.repository == 'OpenDataPlane/odp' }} - runs-on: ah-ubuntu_22_04-c7g_2x-50 + runs-on: $env.RUNNER strategy: fail-fast: false matrix: @@ -176,7 +177,7 @@ jobs: Run_clang: if: ${{ github.repository == 'OpenDataPlane/odp' }} - runs-on: ah-ubuntu_22_04-c7g_2x-50 + runs-on: $env.RUNNER strategy: fail-fast: false matrix: @@ -195,7 +196,7 @@ jobs: Run_CFLAGS: if: ${{ github.repository == 'OpenDataPlane/odp' }} - runs-on: ah-ubuntu_22_04-c7g_2x-50 + runs-on: $env.RUNNER strategy: fail-fast: false matrix: @@ -210,7 +211,7 @@ jobs: Run_OS: if: ${{ github.repository == 'OpenDataPlane/odp' }} - runs-on: ah-ubuntu_22_04-c7g_2x-50 + runs-on: $env.RUNNER strategy: fail-fast: false matrix: @@ -224,7 +225,7 @@ jobs: Run_sched_config: if: ${{ github.repository == 'OpenDataPlane/odp' }} - runs-on: ah-ubuntu_22_04-c7g_2x-50 + runs-on: $env.RUNNER steps: - uses: actions/checkout@v4 - run: sudo docker run -i -v `pwd`:/odp --privileged --shm-size 8g -e CC="${CC}" -e ARCH="${ARCH}" @@ -234,7 +235,7 @@ jobs: Run_stash_config: if: ${{ github.repository == 'OpenDataPlane/odp' }} - runs-on: ah-ubuntu_22_04-c7g_2x-50 + runs-on: $env.RUNNER steps: - uses: actions/checkout@v4 - run: sudo docker run -i -v `pwd`:/odp --privileged --shm-size 8g -e CC="${CC}" -e ARCH="${ARCH}" @@ -244,7 +245,7 @@ jobs: Run_scheduler_sp: if: ${{ github.repository == 'OpenDataPlane/odp' }} - runs-on: ah-ubuntu_22_04-c7g_2x-50 + runs-on: $env.RUNNER steps: - uses: actions/checkout@v4 - run: sudo docker run -i -v `pwd`:/odp --privileged --shm-size 8g -e CC="${CC}" -e ARCH="${ARCH}" @@ -254,7 +255,7 @@ jobs: Run_scheduler_scalable: if: ${{ github.repository == 'OpenDataPlane/odp' }} - runs-on: ah-ubuntu_22_04-c7g_2x-50 + runs-on: $env.RUNNER steps: - uses: actions/checkout@v4 - run: sudo docker run -i -v `pwd`:/odp --privileged --shm-size 8g -e CC="${CC}" -e ARCH="${ARCH}" @@ -264,7 +265,7 @@ jobs: Run_process_mode: if: ${{ github.repository == 'OpenDataPlane/odp' }} - runs-on: ah-ubuntu_22_04-c7g_2x-50 + runs-on: $env.RUNNER steps: - uses: actions/checkout@v4 - run: sudo docker run -i -v `pwd`:/odp --privileged --shm-size 8g -e CC="${CC}" -e ARCH="${ARCH}" @@ -275,7 +276,7 @@ jobs: Run_inline_timer: if: ${{ github.repository == 'OpenDataPlane/odp' }} - runs-on: ah-ubuntu_22_04-c7g_2x-50 + runs-on: $env.RUNNER steps: - uses: actions/checkout@v4 - run: sudo docker run -i -v `pwd`:/odp --privileged --shm-size 8g -e CC="${CC}" -e ARCH="${ARCH}" @@ -286,7 +287,7 @@ jobs: Run_packet_align: if: ${{ github.repository == 'OpenDataPlane/odp' }} - runs-on: ah-ubuntu_22_04-c7g_2x-50 + runs-on: $env.RUNNER steps: - uses: actions/checkout@v4 - run: sudo docker run -i -v `pwd`:/odp --privileged --shm-size 8g -e CC="${CC}" -e ARCH="${ARCH}" @@ -297,7 +298,7 @@ jobs: Run_dpdk-19_11: if: ${{ github.repository == 'OpenDataPlane/odp' }} - runs-on: ah-ubuntu_22_04-c7g_2x-50 + runs-on: $env.RUNNER steps: - uses: actions/checkout@v4 - run: sudo docker run -i -v `pwd`:/odp --privileged --shm-size 8g -e CC="${CC}" -e ARCH="${ARCH}" @@ -307,7 +308,7 @@ jobs: Run_dpdk-20_11: if: ${{ github.repository == 'OpenDataPlane/odp' }} - runs-on: ah-ubuntu_22_04-c7g_2x-50 + runs-on: $env.RUNNER steps: - uses: actions/checkout@v4 - run: sudo docker run -i -v `pwd`:/odp --privileged --shm-size 8g -e CC="${CC}" -e ARCH="${ARCH}" @@ -317,7 +318,7 @@ jobs: Run_dpdk-21_11: if: ${{ github.repository == 'OpenDataPlane/odp' }} - runs-on: ah-ubuntu_22_04-c7g_2x-50 + runs-on: $env.RUNNER steps: - uses: actions/checkout@v4 - run: sudo docker run -i -v `pwd`:/odp --privileged --shm-size 8g -e CC="${CC}" -e ARCH="${ARCH}"