Skip to content

Commit 85c636d

Browse files
committed
cleanup
1 parent a9c5708 commit 85c636d

File tree

1 file changed

+2
-9
lines changed

1 file changed

+2
-9
lines changed

.github/workflows/clk-rebase.yml

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ on:
33
workflow_dispatch:
44
push:
55
branches:
6-
- clk-rebase-ga
6+
- stable_6.12.y
77

88
jobs:
99
clk-rebase:
@@ -21,9 +21,9 @@ jobs:
2121
TMP_CLK_NEXT_BRANCH={automation_tmp}_ciq-6.12.y-next
2222
STABLE_TRACKING_BRANCH=stable_6.12.y
2323
24-
2524
dnf install epel-release -y
2625
dnf install grubby grub2-tools qemu-kvm sudo virtme-ng -y
26+
2727
# so root can call sudo without complaint
2828
echo "root ALL=(ALL:ALL) NOPASSWD: ALL" >> /etc/sudoers
2929
dnf groupinstall 'Development Tools' -y
@@ -55,7 +55,6 @@ jobs:
5555
5656
../kernel-src-tree-tools/lt_rebase.sh
5757
58-
#vng -b --config ciq/configs/kernel-x86_64.config --verbose | tee ../build.log
5958
# need some config tweaks for vng
6059
./scripts/config --file ./ciq/configs/kernel-x86_64.config --enable CONFIG_VSOCKETS
6160
./scripts/config --file ./ciq/configs/kernel-x86_64.config --enable CONFIG_VIRTIO_VSOCKETS
@@ -81,9 +80,6 @@ jobs:
8180
8281
../kernel-src-tree-tools/kernel_build.sh --skip-kabi --no-reboot | tee ../build.log
8382
84-
# HACK HACK HACK
85-
#sed -i 's/sudo//g' ../kernel-src-tree-tools/kernel_kselftest.sh
86-
8783
dnf install curl --allowerasing -y
8884
8985
# should be installed in kernel_kselftest.sh
@@ -94,9 +90,6 @@ jobs:
9490
# HACK HACK HACK
9591
vng --qemu /usr/libexec/qemu-kvm --force-initramfs --disable-microvm --rw --network user --verbose --memory 16G -- sh -c 'mkdir ../kselftest-logs ; echo ok foo:bar > ../kselftest-logs/selftest-$(uname -r).log'
9692
97-
#mkdir ../kselftest-logs
98-
#echo ok foo:bar > ../kselftest-logs/selftest-6.12.XX.log
99-
10093
echo "Selftests passed:"
10194
OK_TESTS=$(grep -a ^ok ../kselftest-logs/selftest* | wc -l)
10295
echo $OK_TESTS

0 commit comments

Comments
 (0)