run-vmtest@v2: modify CI workflows for newer run-vmtest scripts

Signed-off-by: Ihor Solodrai <ihor.solodrai@pm.me>
libbpf · Nov 5, 2024 · 648f92b · 648f92b
1 parent ff45d47
commit 648f92b
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 0 deletions.
diff --git a/.github/workflows/kernel-build.yml b/.github/workflows/kernel-build.yml
@@ -56,6 +56,7 @@ jobs:
         KERNEL: ${{ inputs.kernel }}
         REPO_PATH: ""
         REPO_ROOT: ${{ github.workspace }}
+        KERNEL_ROOT: ${{ github.workspace }}
     steps:
       - uses: actions/checkout@v4
         # We fetch an actual bit of history here to facilitate incremental

diff --git a/.github/workflows/kernel-test.yml b/.github/workflows/kernel-test.yml
@@ -38,21 +38,46 @@ jobs:
     runs-on: ${{ fromJSON(inputs.runs_on) }}
     timeout-minutes: 100
     env:
+      ARCH: ${{ inputs.arch }}
       KERNEL: ${{ inputs.kernel }}
       REPO_ROOT: ${{ github.workspace }}
       REPO_PATH: ""
       # https://github.com/actions/runner/issues/1483#issuecomment-1031671517
       # booleans are weird in GH.
       CONTINUE_ON_ERROR: ${{ inputs.continue_on_error }}
+      DEPLOYMENT: ${{ github.repository == 'kernel-patches/bpf' && 'prod' || 'rc' }}
+      ALLOWLIST_FILE: /tmp/allowlist
+      DENYLIST_FILE: /tmp/denylist
     steps:
       - uses: actions/checkout@v4
+
       - uses: actions/download-artifact@v4
         with:
           name: vmlinux-${{ inputs.arch }}-${{ inputs.toolchain_full }}
           path: .
+
       - name: Untar artifacts
         # 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: ./run-vmtest
         # https://github.com/actions/runner/issues/1483#issuecomment-1031671517