ci: use inbuilt arm64 runners

Use the inbuilt arm64 runners for the cn10k build. Signed-off-by: Pavan Nikhilesh <pbhagavatula@marvell.com> Change-Id: If7a944a199c0048364ff98c52ce600ff0520a21a
MarvellEmbeddedProcessors · Jan 29, 2025 · 488aaae · 488aaae
1 parent 02c884b
commit 488aaae
Show file tree

Hide file tree

Showing 2 changed files with 129 additions and 171 deletions.
diff --git a/.github/workflows/build-cn10k.yml b/.github/workflows/build-cn10k.yml
@@ -3,7 +3,7 @@ name: build-cn10k
 on:
   push:
   schedule:
-    - cron: '0 0 * * 1'
+    - cron: "0 0 * * 1"
 
 permissions:
   contents: write
@@ -13,56 +13,35 @@ permissions:
 jobs:
   ubuntu-cn10k-build:
     name: ubuntu-cn10k-arm64
-    runs-on: ubuntu-latest
-
-    strategy:
-      fail-fast: true
-      matrix:
-        include:
-          - arch: aarch64
-            distro: ubuntu_latest
-            compiler: gcc
-            library: static
-
+    runs-on: ubuntu-24.04-arm
     steps:
-    - name: Checkout sources
-      uses: actions/checkout@v4
-    - name: Generate cache keys
-      id: get_ref_keys
-      run: |
-        echo 'ccache=ccache-${{ matrix.distro }}-${{ matrix.compiler }}-${{ matrix.arch }}-'$(date -u +%Y-w%W) >> $GITHUB_OUTPUT
-    - name: Retrieve ccache cache
-      uses: actions/cache@v4
-      with:
-        path: ~/.ccache
-        key: ${{ steps.get_ref_keys.outputs.ccache }}-${{ github.ref }}
-        restore-keys: |
-          ${{ steps.get_ref_keys.outputs.ccache }}-refs/heads/main
-    - uses: uraimo/run-on-arch-action@v2.8.1
-      name: Build DPDK and generate package
-      id: build
-      with:
-        arch: ${{ matrix.arch }}
-        distro: ${{ matrix.distro }}
-        githubToken: ${{ github.token }}
-        setup: |
+      - name: Checkout sources
+        uses: actions/checkout@v4
+      - name: Generate cache keys
+        id: get_ref_keys
+        run: |
+          echo 'ccache=ccache-'$(date -u +%Y-m%M) >> $GITHUB_OUTPUT
+      - name: Retrieve ccache cache
+        uses: actions/cache@v4
+        with:
+          path: ~/.ccache
+          key: ${{ steps.get_ref_keys.outputs.ccache }}-${{ github.ref }}
+          restore-keys: |
+            ${{ steps.get_ref_keys.outputs.ccache }}-refs/heads/main
+      - name: Build DPDK and generate package
+        id: build
+        run: |
           mkdir -p "${PWD}/artifacts"
           mkdir -p ~/.ccache
-        dockerRunArgs: |
-          --volume "${PWD}/artifacts:/artifacts"
-          --volume "${HOME}/.ccache:/root/.ccache"
-        shell: /bin/bash
-        install: |
-          apt-get update -q -y
-          apt-get install -y build-essential ccache git software-properties-common
-          apt-get install -y ccache libarchive-dev libbsd-dev libbpf-dev
-          apt-get install -y libfdt-dev libjansson-dev
-          apt-get install -y libssl-dev ninja-build pkg-config python3-pip
-          apt-get install -y python3-pyelftools python3-setuptools python3-wheel zlib1g-dev meson gcc
-          apt-get install -y gcc-13
-        run: |
+          sudo apt-get update -q -y
+          sudo apt-get install -y build-essential ccache git software-properties-common
+          sudo apt-get install -y ccache libarchive-dev libbsd-dev libbpf-dev
+          sudo apt-get install -y libfdt-dev libjansson-dev
+          sudo apt-get install -y libssl-dev ninja-build pkg-config python3-pip
+          sudo apt-get install -y python3-pyelftools python3-setuptools python3-wheel zlib1g-dev meson gcc
+          sudo apt-get install -y gcc-13
           export CC='ccache gcc-13'
-          echo "cache_dir = /root/.ccache" > /root/.ccache/ccache.conf
+          echo "cache_dir = ~/.ccache" > ~/.ccache/ccache.conf
           ccache -p
           meson build -Dexamples=all -Denable_drivers="*/cnxk,net/ring,net/tap" -Dplatform=cn10k --prefix="${PWD}/install"
           ninja install -C build
@@ -88,42 +67,42 @@ jobs:
           cd -
           mv "${PWD}/install" "${PWD}/dpdk-${PKG_VERSION_NAME}-cn10k${PKG_POSTFIX}_${MRVL_PKG_VERSION}_arm64"
           dpkg --build "dpdk-${PKG_VERSION_NAME}-cn10k${PKG_POSTFIX}_${MRVL_PKG_VERSION}_arm64"
-          cp "dpdk-${PKG_VERSION_NAME}-cn10k${PKG_POSTFIX}_${MRVL_PKG_VERSION}_arm64.deb" /artifacts/.
-          echo "PKG_VERSION_NAME=${PKG_VERSION_NAME}" >> /artifacts/env
-          echo "MRVL_PKG_VERSION=${MRVL_PKG_VERSION}" >> /artifacts/env
-          echo "PKG_POSTFIX=${PKG_POSTFIX}" >> /artifacts/env
-          echo "DISTRO=${DISTRO}" >> /artifacts/env
-    - name: Export version name
-      id: artifacts
-      run: |
-        source "${PWD}/artifacts/env"
-        echo $PKG_VERSION_NAME
-        echo "PKG_VERSION_NAME=${PKG_VERSION_NAME}" >> "$GITHUB_OUTPUT"
-        echo $MRVL_PKG_VERSION
-        echo "MRVL_PKG_VERSION=${MRVL_PKG_VERSION}" >> "$GITHUB_OUTPUT"
-        echo $PKG_POSTFIX
-        echo "PKG_POSTFIX=${PKG_POSTFIX}" >> "$GITHUB_OUTPUT"
-        [[ "$PKG_POSTFIX" == "-devel" ]] && TAG=devel || TAG=${MRVL_PKG_VERSION}
-        echo "TAG=${TAG}" >> "$GITHUB_OUTPUT"
-        echo "DISTRO=${DISTRO}" >> "$GITHUB_OUTPUT"
-    - name: Upload debian package as artifact
-      uses: actions/upload-artifact@v4.3.1
-      if: ${{ github.event_name == 'push' }}
-      with:
-        name: dpdk-${{ steps.artifacts.outputs.PKG_VERSION_NAME }}-cn10k${{ steps.artifacts.outputs.PKG_POSTFIX }}_${{ steps.artifacts.outputs.MRVL_PKG_VERSION }}_arm64.deb
-        path: ${{ github.workspace }}/artifacts/dpdk-${{ steps.artifacts.outputs.PKG_VERSION_NAME }}-cn10k${{ steps.artifacts.outputs.PKG_POSTFIX }}_${{ steps.artifacts.outputs.MRVL_PKG_VERSION }}_arm64.deb
-    - name: Delete existing release
-      uses: liudonghua123/delete-release-action@v1
-      if: ${{ github.event_name == 'push' }}
-      env:
-        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-      with:
-        release_name: dpdk-cn10k-${{ steps.artifacts.outputs.PKG_VERSION_NAME }}_${{ steps.artifacts.outputs.MRVL_PKG_VERSION }}-${{ steps.artifacts.outputs.DISTRO }}-${{ steps.artifacts.outputs.TAG }}
-        suppress_errors: true
-    - name: Release DPDK cn10k package
-      uses: softprops/action-gh-release@v2.0.4
-      if: ${{ github.event_name == 'push' }}
-      with:
-        tag_name: dpdk-cn10k-${{ steps.artifacts.outputs.PKG_VERSION_NAME }}_${{ steps.artifacts.outputs.MRVL_PKG_VERSION }}-${{ steps.artifacts.outputs.DISTRO }}-${{ steps.artifacts.outputs.TAG }}
-        files: |
+          cp "dpdk-${PKG_VERSION_NAME}-cn10k${PKG_POSTFIX}_${MRVL_PKG_VERSION}_arm64.deb" ${PWD}/artifacts/.
+          echo "PKG_VERSION_NAME=${PKG_VERSION_NAME}" >> ${PWD}/artifacts/env
+          echo "MRVL_PKG_VERSION=${MRVL_PKG_VERSION}" >> ${PWD}/artifacts/env
+          echo "PKG_POSTFIX=${PKG_POSTFIX}" >> ${PWD}/artifacts/env
+          echo "DISTRO=${DISTRO}" >> ${PWD}/artifacts/env
+      - name: Export version name
+        id: artifacts
+        run: |
+          source "${PWD}/artifacts/env"
+          echo $PKG_VERSION_NAME
+          echo "PKG_VERSION_NAME=${PKG_VERSION_NAME}" >> "$GITHUB_OUTPUT"
+          echo $MRVL_PKG_VERSION
+          echo "MRVL_PKG_VERSION=${MRVL_PKG_VERSION}" >> "$GITHUB_OUTPUT"
+          echo $PKG_POSTFIX
+          echo "PKG_POSTFIX=${PKG_POSTFIX}" >> "$GITHUB_OUTPUT"
+          [[ "$PKG_POSTFIX" == "-devel" ]] && TAG=devel || TAG=${MRVL_PKG_VERSION}
+          echo "TAG=${TAG}" >> "$GITHUB_OUTPUT"
+          echo "DISTRO=${DISTRO}" >> "$GITHUB_OUTPUT"
+      - name: Upload debian package as artifact
+        uses: actions/upload-artifact@v4.3.1
+        if: ${{ github.event_name == 'push' }}
+        with:
+          name: dpdk-${{ steps.artifacts.outputs.PKG_VERSION_NAME }}-cn10k${{ steps.artifacts.outputs.PKG_POSTFIX }}_${{ steps.artifacts.outputs.MRVL_PKG_VERSION }}_arm64.deb
+          path: ${{ github.workspace }}/artifacts/dpdk-${{ steps.artifacts.outputs.PKG_VERSION_NAME }}-cn10k${{ steps.artifacts.outputs.PKG_POSTFIX }}_${{ steps.artifacts.outputs.MRVL_PKG_VERSION }}_arm64.deb
+      - name: Delete existing release
+        uses: liudonghua123/delete-release-action@v1
+        if: ${{ github.event_name == 'push' }}
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          release_name: dpdk-cn10k-${{ steps.artifacts.outputs.PKG_VERSION_NAME }}_${{ steps.artifacts.outputs.MRVL_PKG_VERSION }}-${{ steps.artifacts.outputs.DISTRO }}-${{ steps.artifacts.outputs.TAG }}
+          suppress_errors: true
+      - name: Release DPDK cn10k package
+        uses: softprops/action-gh-release@v2.0.4
+        if: ${{ github.event_name == 'push' }}
+        with:
+          tag_name: dpdk-cn10k-${{ steps.artifacts.outputs.PKG_VERSION_NAME }}_${{ steps.artifacts.outputs.MRVL_PKG_VERSION }}-${{ steps.artifacts.outputs.DISTRO }}-${{ steps.artifacts.outputs.TAG }}
+          files: |
             ${{ github.workspace }}/artifacts/dpdk-${{ steps.artifacts.outputs.PKG_VERSION_NAME }}-cn10k${{ steps.artifacts.outputs.PKG_POSTFIX }}_${{ steps.artifacts.outputs.MRVL_PKG_VERSION }}_arm64.deb
diff --git a/.github/workflows/build-cn9k.yml b/.github/workflows/build-cn9k.yml
@@ -3,7 +3,7 @@ name: build-cn9k
 on:
   push:
   schedule:
-    - cron: '0 0 * * 1'
+    - cron: "0 0 * * 1"
 
 permissions:
   contents: write
@@ -13,56 +13,35 @@ permissions:
 jobs:
   ubuntu-cn9k-build:
     name: ubuntu-cn9k-arm64
-    runs-on: ubuntu-latest
-
-    strategy:
-      fail-fast: true
-      matrix:
-        include:
-          - arch: aarch64
-            distro: ubuntu_latest
-            compiler: gcc
-            library: static
-
+    runs-on: ubuntu-24.04-arm
     steps:
-    - name: Checkout sources
-      uses: actions/checkout@v4
-    - name: Generate cache keys
-      id: get_ref_keys
-      run: |
-        echo 'ccache=ccache-${{ matrix.distro }}-${{ matrix.compiler }}-${{ matrix.arch }}-'$(date -u +%Y-w%W) >> $GITHUB_OUTPUT
-    - name: Retrieve ccache cache
-      uses: actions/cache@v4
-      with:
-        path: ~/.ccache
-        key: ${{ steps.get_ref_keys.outputs.ccache }}-${{ github.ref }}
-        restore-keys: |
-          ${{ steps.get_ref_keys.outputs.ccache }}-refs/heads/main
-    - uses: uraimo/run-on-arch-action@v2.8.1
-      name: Build DPDK and generate package
-      id: build
-      with:
-        arch: ${{ matrix.arch }}
-        distro: ${{ matrix.distro }}
-        githubToken: ${{ github.token }}
-        setup: |
+      - name: Checkout sources
+        uses: actions/checkout@v4
+      - name: Generate cache keys
+        id: get_ref_keys
+        run: |
+          echo 'ccache=ccache-'$(date -u +%Y-m%M) >> $GITHUB_OUTPUT
+      - name: Retrieve ccache cache
+        uses: actions/cache@v4
+        with:
+          path: ~/.ccache
+          key: ${{ steps.get_ref_keys.outputs.ccache }}-${{ github.ref }}
+          restore-keys: |
+            ${{ steps.get_ref_keys.outputs.ccache }}-refs/heads/main
+      - name: Build DPDK and generate package
+        id: build
+        run: |
           mkdir -p "${PWD}/artifacts"
           mkdir -p ~/.ccache
-        dockerRunArgs: |
-          --volume "${PWD}/artifacts:/artifacts"
-          --volume "${HOME}/.ccache:/root/.ccache"
-        shell: /bin/bash
-        install: |
-          apt-get update -q -y
-          apt-get install -y build-essential ccache git software-properties-common
-          apt-get install -y ccache libarchive-dev libbsd-dev libbpf-dev
-          apt-get install -y libfdt-dev libjansson-dev
-          apt-get install -y libssl-dev ninja-build pkg-config python3-pip
-          apt-get install -y python3-pyelftools python3-setuptools python3-wheel zlib1g-dev meson gcc
-          apt-get install -y gcc-13
-        run: |
+          sudo apt-get update -q -y
+          sudo apt-get install -y build-essential ccache git software-properties-common
+          sudo apt-get install -y ccache libarchive-dev libbsd-dev libbpf-dev
+          sudo apt-get install -y libfdt-dev libjansson-dev
+          sudo apt-get install -y libssl-dev ninja-build pkg-config python3-pip
+          sudo apt-get install -y python3-pyelftools python3-setuptools python3-wheel zlib1g-dev meson gcc
+          sudo apt-get install -y gcc-13
           export CC='ccache gcc-13'
-          echo "cache_dir = /root/.ccache" > /root/.ccache/ccache.conf
+          echo "cache_dir = ~/.ccache" > ~/.ccache/ccache.conf
           ccache -p
           meson build -Dexamples=all -Denable_drivers="*/cnxk,net/ring,net/tap" -Dplatform=cn9k --prefix="${PWD}/install"
           ninja install -C build
@@ -84,46 +63,46 @@ jobs:
           echo "Maintainer: Jerin Jacob (jerinj@marvell.com)" >> DEBIAN/control
           echo "Architecture: arm64" >> DEBIAN/control
           echo "Homepage: https://www.dpdk.org/" >> DEBIAN/control
-          echo "Description: DPDK Library for Marvell Octeon 9" >> DEBIAN/control
+          echo "Description: DPDK Library for Marvell Octeon 10" >> DEBIAN/control
           cd -
           mv "${PWD}/install" "${PWD}/dpdk-${PKG_VERSION_NAME}-cn9k${PKG_POSTFIX}_${MRVL_PKG_VERSION}_arm64"
           dpkg --build "dpdk-${PKG_VERSION_NAME}-cn9k${PKG_POSTFIX}_${MRVL_PKG_VERSION}_arm64"
-          cp "dpdk-${PKG_VERSION_NAME}-cn9k${PKG_POSTFIX}_${MRVL_PKG_VERSION}_arm64.deb" /artifacts/.
-          echo "PKG_VERSION_NAME=${PKG_VERSION_NAME}" >> /artifacts/env
-          echo "MRVL_PKG_VERSION=${MRVL_PKG_VERSION}" >> /artifacts/env
-          echo "PKG_POSTFIX=${PKG_POSTFIX}" >> /artifacts/env
-          echo "DISTRO=${DISTRO}" >> /artifacts/env
-    - name: Export version name
-      id: artifacts
-      run: |
-        source "${PWD}/artifacts/env"
-        echo $PKG_VERSION_NAME
-        echo "PKG_VERSION_NAME=${PKG_VERSION_NAME}" >> "$GITHUB_OUTPUT"
-        echo $MRVL_PKG_VERSION
-        echo "MRVL_PKG_VERSION=${MRVL_PKG_VERSION}" >> "$GITHUB_OUTPUT"
-        echo $PKG_POSTFIX
-        echo "PKG_POSTFIX=${PKG_POSTFIX}" >> "$GITHUB_OUTPUT"
-        [[ "$PKG_POSTFIX" == "-devel" ]] && TAG=devel || TAG=${MRVL_PKG_VERSION}
-        echo "TAG=${TAG}" >> "$GITHUB_OUTPUT"
-        echo "DISTRO=${DISTRO}" >> "$GITHUB_OUTPUT"
-    - name: Upload debian package as artifact
-      uses: actions/upload-artifact@v4.3.1
-      if: ${{ github.event_name == 'push' }}
-      with:
-        name: dpdk-${{ steps.artifacts.outputs.PKG_VERSION_NAME }}-cn9k${{ steps.artifacts.outputs.PKG_POSTFIX }}_${{ steps.artifacts.outputs.MRVL_PKG_VERSION }}_arm64.deb
-        path: ${{ github.workspace }}/artifacts/dpdk-${{ steps.artifacts.outputs.PKG_VERSION_NAME }}-cn9k${{ steps.artifacts.outputs.PKG_POSTFIX }}_${{ steps.artifacts.outputs.MRVL_PKG_VERSION }}_arm64.deb
-    - name: Delete existing release
-      uses: liudonghua123/delete-release-action@v1
-      if: ${{ github.event_name == 'push' }}
-      env:
-        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-      with:
-        release_name: dpdk-cn9k-${{ steps.artifacts.outputs.PKG_VERSION_NAME }}_${{ steps.artifacts.outputs.MRVL_PKG_VERSION }}-${{ steps.artifacts.outputs.DISTRO }}-${{ steps.artifacts.outputs.TAG }}
-        suppress_errors: true
-    - name: Release DPDK cn9k package
-      uses: softprops/action-gh-release@v2.0.4
-      if: ${{ github.event_name == 'push' }}
-      with:
-        tag_name: dpdk-cn9k-${{ steps.artifacts.outputs.PKG_VERSION_NAME }}_${{ steps.artifacts.outputs.MRVL_PKG_VERSION }}-${{ steps.artifacts.outputs.DISTRO }}-${{ steps.artifacts.outputs.TAG }}
-        files: |
+          cp "dpdk-${PKG_VERSION_NAME}-cn9k${PKG_POSTFIX}_${MRVL_PKG_VERSION}_arm64.deb" ${PWD}/artifacts/.
+          echo "PKG_VERSION_NAME=${PKG_VERSION_NAME}" >> ${PWD}/artifacts/env
+          echo "MRVL_PKG_VERSION=${MRVL_PKG_VERSION}" >> ${PWD}/artifacts/env
+          echo "PKG_POSTFIX=${PKG_POSTFIX}" >> ${PWD}/artifacts/env
+          echo "DISTRO=${DISTRO}" >> ${PWD}/artifacts/env
+      - name: Export version name
+        id: artifacts
+        run: |
+          source "${PWD}/artifacts/env"
+          echo $PKG_VERSION_NAME
+          echo "PKG_VERSION_NAME=${PKG_VERSION_NAME}" >> "$GITHUB_OUTPUT"
+          echo $MRVL_PKG_VERSION
+          echo "MRVL_PKG_VERSION=${MRVL_PKG_VERSION}" >> "$GITHUB_OUTPUT"
+          echo $PKG_POSTFIX
+          echo "PKG_POSTFIX=${PKG_POSTFIX}" >> "$GITHUB_OUTPUT"
+          [[ "$PKG_POSTFIX" == "-devel" ]] && TAG=devel || TAG=${MRVL_PKG_VERSION}
+          echo "TAG=${TAG}" >> "$GITHUB_OUTPUT"
+          echo "DISTRO=${DISTRO}" >> "$GITHUB_OUTPUT"
+      - name: Upload debian package as artifact
+        uses: actions/upload-artifact@v4.3.1
+        if: ${{ github.event_name == 'push' }}
+        with:
+          name: dpdk-${{ steps.artifacts.outputs.PKG_VERSION_NAME }}-cn9k${{ steps.artifacts.outputs.PKG_POSTFIX }}_${{ steps.artifacts.outputs.MRVL_PKG_VERSION }}_arm64.deb
+          path: ${{ github.workspace }}/artifacts/dpdk-${{ steps.artifacts.outputs.PKG_VERSION_NAME }}-cn9k${{ steps.artifacts.outputs.PKG_POSTFIX }}_${{ steps.artifacts.outputs.MRVL_PKG_VERSION }}_arm64.deb
+      - name: Delete existing release
+        uses: liudonghua123/delete-release-action@v1
+        if: ${{ github.event_name == 'push' }}
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          release_name: dpdk-cn9k-${{ steps.artifacts.outputs.PKG_VERSION_NAME }}_${{ steps.artifacts.outputs.MRVL_PKG_VERSION }}-${{ steps.artifacts.outputs.DISTRO }}-${{ steps.artifacts.outputs.TAG }}
+          suppress_errors: true
+      - name: Release DPDK cn9k package
+        uses: softprops/action-gh-release@v2.0.4
+        if: ${{ github.event_name == 'push' }}
+        with:
+          tag_name: dpdk-cn9k-${{ steps.artifacts.outputs.PKG_VERSION_NAME }}_${{ steps.artifacts.outputs.MRVL_PKG_VERSION }}-${{ steps.artifacts.outputs.DISTRO }}-${{ steps.artifacts.outputs.TAG }}
+          files: |
             ${{ github.workspace }}/artifacts/dpdk-${{ steps.artifacts.outputs.PKG_VERSION_NAME }}-cn9k${{ steps.artifacts.outputs.PKG_POSTFIX }}_${{ steps.artifacts.outputs.MRVL_PKG_VERSION }}_arm64.deb