Skip to content

Commit

Permalink
lvh: Add net branch of bpf-next
Browse files Browse the repository at this point in the history
For testing we also need the net branch of bpf-next.

Signed-off-by: Daniel Borkmann <[email protected]>
  • Loading branch information
borkmann committed Oct 25, 2024
1 parent 74d3fde commit c9b3d51
Show file tree
Hide file tree
Showing 4 changed files with 12 additions and 3 deletions.
2 changes: 2 additions & 0 deletions .github/workflows/bpf-next.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ jobs:
git config user.name "GH action"
git config user.email "[email protected]"
echo "bpf-next $id" > misc/dummy
echo "bpf-net $id" >> misc/dummy
echo "bpf $id" >> misc/dummy
git add misc/dummy
git commit -a -m "bpf/bpf-next: $id"
Expand All @@ -32,6 +33,7 @@ jobs:
id=${{ steps.commit.outputs.id }}
gh pr create \
-l "gha-builds/kernel/bpf-next" \
-l "gha-builds/kernel/bpf-net" \
-l "gha-builds/kernel/bpf" \
--title "bpf/bpf-next update: $id" \
--body "PR to update bpf/bpf-next" \
2 changes: 1 addition & 1 deletion .github/workflows/buildx.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ jobs:
name: kernel versions
with:
script: |
var all_kernels = ['4.19', '5.4', '5.10', '5.15', '6.1', '6.6', 'bpf', 'bpf-next', 'rhel8.6', 'rhel8.9' ]
var all_kernels = ['4.19', '5.4', '5.10', '5.15', '6.1', '6.6', 'bpf', 'bpf-net', 'bpf-next', 'rhel8.6', 'rhel8.9' ]
var kernels = []
const kernel_label_prefix = 'gha-builds/kernel/'
res = await github.rest.issues.listLabelsOnIssue({
Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ COMPLEXITY_TEST_IMAGES ?= $(OCIORG)/complexity-test-ci
KERNEL_BUILDER_TAG ?= main
ROOT_BUILDER_TAG ?= main
ROOT_IMAGES_TAG ?= main
KERNEL_VERSIONS ?= 4.19 5.4 5.10 5.15 6.1 6.6 bpf bpf-next
KERNEL_VERSIONS ?= 4.19 5.4 5.10 5.15 6.1 6.6 bpf bpf-net bpf-next

DOCKER ?= docker
export DOCKER_BUILDKIT = 1
Expand Down
9 changes: 8 additions & 1 deletion _data/kernels.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"kernels": [
{
{
"name": "bpf-next",
"url": "git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf-next.git?depth=1",
"opts": [
Expand All @@ -14,6 +14,13 @@
[ "--enable", "CONFIG_NETKIT"]
]
},
{
"name": "bpf-net",
"url": "git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf-next.git?depth=1#net",
"opts": [
[ "--enable", "CONFIG_NETKIT"]
]
},
{
"name": "6.6",
"url": "git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git?depth=1#linux-6.6.y"
Expand Down

0 comments on commit c9b3d51

Please sign in to comment.