Merge libbpf/ci#166 (#329)

theihor · web-flow · commit a4ad95cc0eed · 2025-01-14T14:19:58.000-08:00
* Add ci/vmtest/configs/run-vmtest.env to control allow/deny lists
* Use v3 of libbpf/ci actions in all workflows

Signed-off-by: Ihor Solodrai &lt;ihor.solodrai@pm.me&gt;
diff --git a/.github/workflows/kernel-build.yml b/.github/workflows/kernel-build.yml
@@ -62,11 +62,11 @@ jobs:
         name: Download bpf-next tree
         env:
           FETCH_DEPTH: ${{ env.BPF_NEXT_FETCH_DEPTH }}
-        uses: libbpf/ci/get-linux-source@v2
+        uses: libbpf/ci/get-linux-source@v3
         with:
           dest: '.kernel'
           rev: ${{ env.BPF_NEXT_BASE_BRANCH }}
-      - uses: libbpf/ci/prepare-incremental-build@v2
+      - uses: libbpf/ci/prepare-incremental-build@v3
         with:
           repo-root: ${{ inputs.download_sources && '.kernel' || env.REPO_ROOT }}
           base-branch: >-
@@ -86,34 +86,28 @@ jobs:
           mv -t .. $(ls -A)
           cd ..
           rmdir .kernel
-      - uses:  libbpf/ci/patch-kernel@v2
+      - uses:  libbpf/ci/patch-kernel@v3
         with:
           patches-root: '${{ github.workspace }}/ci/diffs'
           repo-root: ${{ env.REPO_ROOT }}
+
       - name: Setup build environment
-        uses: libbpf/ci/setup-build-env@v2
+        uses: libbpf/ci/setup-build-env@v3
         with:
           arch: ${{ inputs.arch }}
           llvm-version: ${{ inputs.llvm-version }}
           pahole: master
-      - name: Print toolchain version used
-        shell: bash
-        run: |
-          TOOLCHAIN=${{ inputs.toolchain }}
-          if [ $TOOLCHAIN = "llvm" ]; then
-            TOOLCHAIN="clang-${{ inputs.llvm-version }}"
-          fi
-          ${TOOLCHAIN} --version
+
       - name: Build kernel image
-        uses: libbpf/ci/build-linux@v2
+        uses: libbpf/ci/build-linux@v3
         with:
           arch: ${{ inputs.arch }}
           toolchain: ${{ inputs.toolchain }}
           kbuild-output: ${{ env.KBUILD_OUTPUT }}
           max-make-jobs: 32
           llvm-version: ${{ inputs.llvm-version }}
       - name: Build selftests/bpf
-        uses: libbpf/ci/build-selftests@v2
+        uses: libbpf/ci/build-selftests@v3
         env:
           MAX_MAKE_JOBS: 32
           RELEASE: ${{ inputs.release && '1' || '' }}
@@ -125,17 +119,18 @@ jobs:
 
       - if: ${{ env.BUILD_SCHED_EXT_SELFTESTS }}
         name: Build selftests/sched_ext
-        uses: libbpf/ci/build-scx-selftests@v2
+        uses: libbpf/ci/build-scx-selftests@v3
         with:
           kbuild-output: ${{ env.KBUILD_OUTPUT }}
           repo-root: ${{ env.REPO_ROOT }}
           arch: ${{ inputs.arch }}
           toolchain: ${{ inputs.toolchain }}
           llvm-version: ${{ inputs.llvm-version }}
           max-make-jobs: 32
+
       - if: ${{ github.event_name != 'push' }}
         name: Build samples
-        uses: libbpf/ci/build-samples@v2
+        uses: libbpf/ci/build-samples@v3
         with:
           arch: ${{ inputs.arch }}
           toolchain: ${{ inputs.toolchain }}
@@ -144,7 +139,7 @@ jobs:
           llvm-version: ${{ inputs.llvm-version }}
       - name: Tar artifacts
         id: tar-artifacts
-        uses: libbpf/ci/tar-artifacts@v2
+        uses: libbpf/ci/tar-artifacts@v3
         env:
           ARCHIVE_BPF_SELFTESTS: 'true'
           ARCHIVE_MAKE_HELPERS: 'true'
diff --git a/.github/workflows/kernel-test.yml b/.github/workflows/kernel-test.yml
@@ -64,31 +64,18 @@ jobs:
         # zstd is installed by default in the runner images.
         run: zstd -d -T0  vmlinux-${{ inputs.arch }}-${{ inputs.toolchain_full }}.tar.zst --stdout | tar -xf -
 
-      - name: Prepare ALLOW/DENYLIST
-        env:
-          SELFTESTS_BPF: ${{ github.workspace }}/selftests/bpf
-          VMTEST_CONFIGS: ${{ github.workspace }}/ci/vmtest/configs
-        run: |
-          cat "${SELFTESTS_BPF}/ALLOWLIST"          \
-              "${SELFTESTS_BPF}/ALLOWLIST.${ARCH}"  \
-              "${VMTEST_CONFIGS}/ALLOWLIST"         \
-              "${VMTEST_CONFIGS}/ALLOWLIST.${ARCH}" \
-            2> /dev/null > "${ALLOWLIST_FILE}" || true
-
-          cat "${SELFTESTS_BPF}/DENYLIST" \
-              "${SELFTESTS_BPF}/DENYLIST.${ARCH}" \
-              "${VMTEST_CONFIGS}/DENYLIST" \
-              "${VMTEST_CONFIGS}/DENYLIST.${ARCH}" \
-              "${VMTEST_CONFIGS}/DENYLIST.${DEPLOYMENT}" \
-            2> /dev/null > "${DENYLIST_FILE}" || true
-
       - name: Run selftests
-        uses: libbpf/ci/run-vmtest@v2
+        uses: libbpf/ci/run-vmtest@v3
         # https://github.com/actions/runner/issues/1483#issuecomment-1031671517
         # booleans are weird in GH.
         continue-on-error: ${{ fromJSON(env.CONTINUE_ON_ERROR) }}
         timeout-minutes: ${{ inputs.timeout_minutes }}
         env:
+          ARCH: ${{ inputs.arch }}
+          DEPLOYMENT: ${{ env.DEPLOYMENT }}
+          KERNEL_TEST: ${{ inputs.test }}
+          SELFTESTS_BPF: ${{ github.workspace }}/selftests/bpf
+          VMTEST_CONFIGS: ${{ github.workspace }}/ci/vmtest/configs
           TEST_PROGS_WATCHDOG_TIMEOUT: 300
         with:
           arch: ${{ inputs.arch }}
diff --git a/.github/workflows/veristat-kernel.yml b/.github/workflows/veristat-kernel.yml
@@ -48,7 +48,7 @@ jobs:
         run: zstd -d -T0  vmlinux-${{ env.ARCH_AND_TOOL }}.tar.zst --stdout | tar -xf -
 
       - name: Run veristat
-        uses: libbpf/ci/run-vmtest@v2
+        uses: libbpf/ci/run-vmtest@v3
         with:
           arch: x86_64
           vmlinuz: '${{ github.workspace }}/vmlinuz'
diff --git a/.github/workflows/veristat-meta.yml b/.github/workflows/veristat-meta.yml
@@ -56,7 +56,7 @@ jobs:
         run: zstd -d -T0  vmlinux-${{ env.ARCH_AND_TOOL }}.tar.zst --stdout | tar -xf -
 
       - name: Configure AWS Credentials
-        uses: aws-actions/configure-aws-credentials@v2
+        uses: aws-actions/configure-aws-credentials@v3
         with:
           aws-region: ${{ inputs.aws_region }}
           role-to-assume: ${{ secrets.AWS_ROLE_ARN }}
@@ -70,7 +70,7 @@ jobs:
           AWS_ROLE_ARN: ${{ secrets.AWS_ROLE_ARN }}
 
       - name: Run veristat
-        uses: libbpf/ci/run-vmtest@v2
+        uses: libbpf/ci/run-vmtest@v3
         with:
           arch: x86_64
           vmlinuz: '${{ github.workspace }}/vmlinuz'
diff --git a/ci/vmtest/configs/run-vmtest.env b/ci/vmtest/configs/run-vmtest.env
@@ -0,0 +1,42 @@
+#!/bin/bash
+
+# This file is sourced by libbpf/ci/run-vmtest Github Action scripts.
+#
+# The primary reason it exists is that assembling ALLOWLIST and
+# DENYLIST for a particular test run is not a trivial operation.
+#
+# Users of libbpf/ci/run-vmtest action need to be able to specify a
+# list of allow/denylist **files**, that later has to be correctly
+# merged into a single allow/denylist passed to a test runner.
+#
+# Obviously it's perferrable for the scripts merging many lists into
+# one to be reusable, and not copy-pasted between repositories which
+# use libbpf/ci actions. And specifying the lists should be trivial.
+# This file is a solution to that.
+
+# $SELFTESTS_BPF and $VMTEST_CONFIGS are set in the workflow, before
+# libbpf/ci/run-vmtest action is called
+# See .github/workflows/kernel-test.yml
+
+ALLOWLIST_FILES=(
+    "${SELFTESTS_BPF}/ALLOWLIST"
+    "${SELFTESTS_BPF}/ALLOWLIST.${ARCH}"
+    "${VMTEST_CONFIGS}/ALLOWLIST"
+    "${VMTEST_CONFIGS}/ALLOWLIST.${ARCH}"
+    "${VMTEST_CONFIGS}/ALLOWLIST.${DEPLOYMENT}"
+    "${VMTEST_CONFIGS}/ALLOWLIST.${KERNEL_TEST}"
+)
+
+DENYLIST_FILES=(
+    "${SELFTESTS_BPF}/DENYLIST"
+    "${SELFTESTS_BPF}/DENYLIST.${ARCH}"
+    "${VMTEST_CONFIGS}/DENYLIST"
+    "${VMTEST_CONFIGS}/DENYLIST.${ARCH}"
+    "${VMTEST_CONFIGS}/DENYLIST.${DEPLOYMENT}"
+    "${VMTEST_CONFIGS}/DENYLIST.${KERNEL_TEST}"
+)
+
+# Export pipe-separated strings, because bash doesn't support array export
+export SELFTESTS_BPF_ALLOWLIST_FILES=$(IFS="|"; echo "${ALLOWLIST_FILES[*]}")
+export SELFTESTS_BPF_DENYLIST_FILES=$(IFS="|"; echo "${DENYLIST_FILES[*]}")
+
