Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[vmtest] using danobi/vmtest #2

Closed
wants to merge 1 commit into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 10 additions & 2 deletions .github/scripts/matrix.py
Original file line number Diff line number Diff line change
Expand Up @@ -55,21 +55,25 @@ def get_tests(config):
return [test for test in tests if not test.endswith("parallel")]


matrix = [
"""
{
"kernel": "LATEST",
"runs_on": [],
"arch": Arch.X86_64.value,
"toolchain": "gcc",
"llvm-version": "16",
},
"""
matrix = [
{
"kernel": "LATEST",
"runs_on": [],
"arch": Arch.X86_64.value,
"toolchain": "llvm",
"llvm-version": "16",
},
]
"""
{
"kernel": "LATEST",
"runs_on": [],
Expand All @@ -93,6 +97,7 @@ def get_tests(config):
"parallel_tests": False,
},
]
"""
self_hosted_repos = [
"kernel-patches/bpf",
"kernel-patches/vmtest",
Expand Down Expand Up @@ -132,10 +137,13 @@ def get_tests(config):
}
set_output("test_matrix", dumps(test_matrix))

veristat_runs_on = next(
veristat_runs_on = []
"""
next(
x["runs_on"]
for x in matrix
if x["arch"] == os.environ["veristat_arch"]
and x["toolchain"] == os.environ["veristat_toolchain"]
)
"""
set_output("veristat_runs_on", veristat_runs_on)
12 changes: 1 addition & 11 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -150,18 +150,8 @@ jobs:
- name: Untar artifacts
# zstd is installed by default in the runner images.
run: zstd -d -T0 vmlinux-${{ matrix.arch }}-${{ matrix.toolchain_full }}.tar.zst --stdout | tar -xf -
- name: Prepare rootfs
uses: libbpf/ci/prepare-rootfs@main
with:
project-name: 'libbpf'
arch: ${{ matrix.arch }}
kernel: ${{ matrix.kernel }}
kernel-root: '.'
kbuild-output: ${{ env.KBUILD_OUTPUT }}
image-output: '/tmp/root.img'
test: ${{ matrix.test }}
- name: Run selftests
uses: libbpf/ci/run-qemu@main
uses: chantra/libbpf-ci/run-qemu@vmtest
continue-on-error: ${{ matrix.continue_on_error }}
timeout-minutes: ${{ matrix.timeout_minutes }}
with:
Expand Down