try using kernel_build.sh

Author: bmastbergen

.github/workflows/clk-rebase.yml

@@ -23,9 +23,9 @@ jobs:
 
 
           dnf install epel-release -y
-          dnf install procps-ng -y
-          free -h
-          dnf install qemu-kvm virtme-ng -y
+          dnf install grubby grub2-tools qemu-kvm sudo virtme-ng -y
+          # so root can call sudo without complaint
+          echo "root ALL=(ALL:ALL) NOPASSWD: ALL" >> /etc/sudoers
           dnf groupinstall 'Development Tools' -y
           dnf install --enablerepo=crb bc dwarves iproute kernel-devel openssl-devel elfutils-libelf-devel -y
 
@@ -55,20 +55,47 @@ jobs:
 
           ../kernel-src-tree-tools/lt_rebase.sh
 
-          vng -b --config ciq/configs/kernel-x86_64.config --verbose | tee ../build.log
+          #vng -b --config ciq/configs/kernel-x86_64.config --verbose | tee ../build.log
+          # need some config tweaks for vng
+          ./scripts/config --file ./ciq/configs/kernel-x86_64.config --enable CONFIG_VSOCKETS
+          ./scripts/config --file ./ciq/configs/kernel-x86_64.config --enable CONFIG_VIRTIO_VSOCKETS
+          ./scripts/config --file ./ciq/configs/kernel-x86_64.config --enable CONFIG_VIRTIO_VSOCKETS_COMMON
+          ./scripts/config --file ./ciq/configs/kernel-x86_64.config --enable CONFIG_VSOCKETS
+          ./scripts/config --file ./ciq/configs/kernel-x86_64.config --enable CONFIG_NET_9P
+          ./scripts/config --file ./ciq/configs/kernel-x86_64.config --enable CONFIG_NET_9P_FD
+          ./scripts/config --file ./ciq/configs/kernel-x86_64.config --enable CONFIG_NET_9P_VIRTIO
+          ./scripts/config --file ./ciq/configs/kernel-x86_64.config --enable CONFIG_FAILOVER
+          ./scripts/config --file ./ciq/configs/kernel-x86_64.config --enable CONFIG_BLK_SD_DEV
+          ./scripts/config --file ./ciq/configs/kernel-x86_64.config --enable CONFIG_SCSI_VIRTIO
+          ./scripts/config --file ./ciq/configs/kernel-x86_64.config --enable CONFIG_VIRTIO_NET
+          ./scripts/config --file ./ciq/configs/kernel-x86_64.config --enable CONFIG_NET_FAILOVER
+          ./scripts/config --file ./ciq/configs/kernel-x86_64.config --enable CONFIG_VIRTIO_CONSOLE
+          ./scripts/config --file ./ciq/configs/kernel-x86_64.config --enable CONFIG_I6300ESB_WDT
+          ./scripts/config --file ./ciq/configs/kernel-x86_64.config --enable CONFIG_VIRTIO_BALLOON
+          ./scripts/config --file ./ciq/configs/kernel-x86_64.config --enable CONFIG_VIRTIO_MMIO
+          ./scripts/config --file ./ciq/configs/kernel-x86_64.config --enable CONFIG_FUSE_FS
+          ./scripts/config --file ./ciq/configs/kernel-x86_64.config --enable CONFIG_VIRTIO_FS
+          ./scripts/config --file ./ciq/configs/kernel-x86_64.config --enable CONFIG_OVERLAY_FS
+          ./scripts/config --file ./ciq/configs/kernel-x86_64.config --enable CONFIG_NETFS_SUPPORT
+          ./scripts/config --file ./ciq/configs/kernel-x86_64.config --enable CONFIG_9P_FS
+
+          ../kernel-src-tree-tools/kernel_build.sh --skip-kabi --no-reboot | tee ../build.log
 
           # HACK HACK HACK
-          sed -i 's/sudo//g' ../kernel-src-tree-tools/kernel_kselftest.sh
+          #sed -i 's/sudo//g' ../kernel-src-tree-tools/kernel_kselftest.sh
 
           dnf install curl --allowerasing -y
 
           # should be installed in kernel_kselftest.sh
           dnf install conntrack-tools e2fsprogs ethtool iptables iputils ipvsadm kernel-tools nftables teamd traceroute -y
 
           #vng --qemu /usr/libexec/qemu-kvm --force-initramfs --disable-microvm --rw --network user --verbose --memory 16G -- ../kernel-src-tree-tools/kernel_kselftest.sh
+
           # HACK HACK HACK
-          mkdir ../kselftest-logs
-          echo ok foo:bar > ../kselftest-logs/selftest-6.12.XX.log
+          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'
+
+          #mkdir ../kselftest-logs
+          #echo ok foo:bar > ../kselftest-logs/selftest-6.12.XX.log
 
           echo "Selftests passed:"
           OK_TESTS=$(grep -a ^ok ../kselftest-logs/selftest* | wc -l)
@@ -78,10 +105,6 @@ jobs:
           STABLE_VERSION=$(git log -1 --format=%s $STABLE_TRACKING_BRANCH | grep -oP 'Linux \K[0-9]+\.[0-9]+\.[0-9]+' || echo "unknown")
           echo "Rebased to stable version: $STABLE_VERSION"
 
-          # Debug: Show all local branches
-          echo "Local branches:"
-          git branch -a
-
           # Push the branches
           git push origin $CLK_NEXT_BRANCH
           git push origin $TMP_CLK_NEXT_BRANCH
@@ -118,8 +141,9 @@ jobs:
           STABLE_VERSION=$(cat ../stable_version.txt)
           OK_TESTS=$(cat ../ok_tests.txt)
 
-          # Extract abbreviated build log (last 50 lines with timing summary)
-          BUILD_LOG_SUMMARY=$(tail -50 ../build.log)
+          # Extract abbreviated build log (first 20 and last 20 lines)
+          #BUILD_LOG_SUMMARY=$(head -20 ../build.log && echo "" && echo "[snip]" && echo "" && tail -20 ../build.log)
+          BUILD_LOG_SUMMARY=$(egrep -B 5 -A 5 "\[TIMER\]|^Starting Build" ../build.log)
 
           # Get artifact URLs (will be available after workflow completes)
           RUN_ID="${{ github.run_id }}"