Skip to content

Commit 608f361

Browse files
committed
skip net/forwarding
1 parent 0c1ff30 commit 608f361

File tree

2 files changed

+5
-2
lines changed

2 files changed

+5
-2
lines changed

.github/workflows/clk-rebase-parallel.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ on:
44
push:
55
branches:
66
- stable_6.*.y
7-
- clk-rebase-ga
87

98
jobs:
109
rebase-and-build:
@@ -82,7 +81,7 @@ jobs:
8281
./scripts/config --file ./ciq/configs/kernel-x86_64.config --enable CONFIG_NET_9P_FD
8382
./scripts/config --file ./ciq/configs/kernel-x86_64.config --enable CONFIG_NET_9P_VIRTIO
8483
./scripts/config --file ./ciq/configs/kernel-x86_64.config --enable CONFIG_FAILOVER
85-
./scripts/config --file ./ciq/configs/kernel-x86_64.config --enable CONFIG_BLK_SD_DEV
84+
./scripts/config --file ./ciq/configs/kernel-x86_64.config --enable CONFIG_BLK_DEV_SD
8685
./scripts/config --file ./ciq/configs/kernel-x86_64.config --enable CONFIG_SCSI_VIRTIO
8786
./scripts/config --file ./ciq/configs/kernel-x86_64.config --enable CONFIG_VIRTIO_NET
8887
./scripts/config --file ./ciq/configs/kernel-x86_64.config --enable CONFIG_NET_FAILOVER

.github/workflows/clk-rebase.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ on:
44
push:
55
branches:
66
- stable_6.*.y
7+
- clk-rebase-ga
78

89
jobs:
910
clk-rebase:
@@ -117,6 +118,9 @@ jobs:
117118
run: |
118119
cd kernel-src-tree
119120
121+
# HACK HACK HACK net/forwarding takes forever, skip it
122+
sed -i 's/SKIP_TARGETS="lkdtm"/SKIP_TARGETS="lkdtm net\/forwarding"/g' ../kernel-src-tree-tools/kernel_kselftest.sh
123+
120124
vng --qemu /usr/libexec/qemu-kvm --force-initramfs --disable-microvm --rw --network user --verbose --memory 16G -- ../kernel-src-tree-tools/kernel_kselftest.sh
121125
122126
# HACK HACK HACK

0 commit comments

Comments
 (0)