run-vmtest: set SELFTESTS_BPF for veristat

Also: * DENYLIST: remove uprobe_multi_test/consumers as it is supposed to pass now on bpf-next * kernel-test: remove img action input passed to run-vmtest Signed-off-by: Ihor Solodrai <[email protected]>
libbpf · Nov 20, 2024 · 825b986 · 825b986
1 parent 09ddb33
commit 825b986
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 6 deletions.
diff --git a/.github/workflows/kernel-test.yml b/.github/workflows/kernel-test.yml
@@ -86,7 +86,6 @@ jobs:
         timeout-minutes: ${{ inputs.timeout_minutes }}
         with:
           arch: ${{ inputs.arch }}
-          img: '/tmp/root.img'
           vmlinuz: '${{ github.workspace }}/vmlinuz'
           kernel-root: ${{ env.REPO_ROOT }}
           max-cpu: 8

diff --git a/ci/vmtest/configs/DENYLIST b/ci/vmtest/configs/DENYLIST
@@ -12,4 +12,3 @@ xdp_bonding/xdp_bonding_features     # started failing after net merge from 359e
 tc_redirect/tc_redirect_dtime # uapi breakage after net-next commit 885c36e59f46 ("net: Re-use and set mono_delivery_time bit for userspace tstamp packets")
 migrate_reuseport/IPv4 TCP_NEW_SYN_RECV reqsk_timer_handler # flaky, under investigation
 migrate_reuseport/IPv6 TCP_NEW_SYN_RECV reqsk_timer_handler # flaky, under investigation
-uprobe_multi_test/consumers
diff --git a/ci/vmtest/configs/run_veristat.kernel.cfg b/ci/vmtest/configs/run_veristat.kernel.cfg
@@ -1,4 +1,4 @@
-VERISTAT_OBJECTS_DIR="${BPF_SELFTESTS_DIR}"
+VERISTAT_OBJECTS_DIR="${SELFTESTS_BPF}"
 VERISTAT_OBJECTS_GLOB="*.bpf.o"
-VERISTAT_CFG_FILE="${BPF_SELFTESTS_DIR}/veristat.cfg"
+VERISTAT_CFG_FILE="${SELFTESTS_BPF}/veristat.cfg"
 VERISTAT_OUTPUT="veristat-kernel"
diff --git a/run-vmtest/run-bpf-selftests.sh b/run-vmtest/run-bpf-selftests.sh
@@ -18,7 +18,8 @@ source "$(cd "$(dirname "$0")" && pwd)/helpers.sh"
 
 ARCH=$(uname -m)
 
-SELFTESTS_BPF=${SELFTESTS_BPF:-/mnt/vmtest/selftests/bpf}
+export SELFTESTS_BPF=${SELFTESTS_BPF:-/mnt/vmtest/selftests/bpf}
+
 STATUS_FILE=${STATUS_FILE:-/mnt/vmtest/exitstatus}
 OUTPUT_DIR=${OUTPUT_DIR:-/mnt/vmtest}
 
@@ -100,7 +101,7 @@ run_veristat_helper() {
     source "${VERISTAT_CONFIGS}/run_veristat.${mode}.cfg"
     pushd "${VERISTAT_OBJECTS_DIR}"
 
-    "${BPF_SELFTESTS_DIR}/veristat" -o csv -q -e file,prog,verdict,states ${VERISTAT_OBJECTS_GLOB} > \
+    "${SELFTESTS_BPF}/veristat" -o csv -q -e file,prog,verdict,states ${VERISTAT_OBJECTS_GLOB} > \
       "${OUTPUT_DIR}/${VERISTAT_OUTPUT}"
 
     echo "run_veristat_${mode}:$?" >> ${STATUS_FILE}