From 84b33cfc49b03553e3d653df475039aff1e63224 Mon Sep 17 00:00:00 2001 From: zengxianjun Date: Fri, 29 Nov 2024 15:37:32 +0800 Subject: [PATCH 1/6] debug ci code --- .github/actions/prepare-ci-code/action.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/actions/prepare-ci-code/action.yml b/.github/actions/prepare-ci-code/action.yml index d0ed95b05a098..ef97b40fe0665 100644 --- a/.github/actions/prepare-ci-code/action.yml +++ b/.github/actions/prepare-ci-code/action.yml @@ -11,7 +11,7 @@ runs: set -e target=tmp - branch=5.4.143-velinux + branch=ci-5.4.143-velinux git clone -b $branch ${{ github.server_url }}/${{ github.repository }}.git $target shell: bash From 12edd0b461666fa6169b06b87a2074788f76dc26 Mon Sep 17 00:00:00 2001 From: zengxianjun Date: Fri, 29 Nov 2024 15:48:22 +0800 Subject: [PATCH 2/6] change workflow repo --- .github/workflows/build-and-test.yml | 6 +++--- .github/workflows/pull-request.yml | 4 ++-- .github/workflows/static.yml | 8 ++++---- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml index 10c42a842ff7d..7cd219383f7d1 100644 --- a/.github/workflows/build-and-test.yml +++ b/.github/workflows/build-and-test.yml @@ -24,14 +24,14 @@ jobs: ssh-key: ${{ secrets.ssh_key }} set-safe-directory: true - name: PrepareCICode - uses: bytedance/kernel/.github/actions/prepare-ci-code@5.4.143-velinux + uses: mistachio/kernel/.github/actions/prepare-ci-code@5.4.143-velinux - name: BuildKernel - uses: bytedance/kernel/.github/actions/build-kernel@5.4.143-velinux + uses: mistachio/kernel/.github/actions/build-kernel@5.4.143-velinux with: arch: ${{ matrix.arch }} distro-code: ${{ matrix.distro_code }} - name: TestKernel - uses: bytedance/kernel/.github/actions/test-kernel@5.4.143-velinux + uses: mistachio/kernel/.github/actions/test-kernel@5.4.143-velinux with: arch: ${{ matrix.arch }} distro-code: ${{ matrix.distro_code }} diff --git a/.github/workflows/pull-request.yml b/.github/workflows/pull-request.yml index a49e31244c307..29d309a8c5cd1 100644 --- a/.github/workflows/pull-request.yml +++ b/.github/workflows/pull-request.yml @@ -11,10 +11,10 @@ on: jobs: StaticCheck: - uses: bytedance/kernel/.github/workflows/static.yml@5.4.143-velinux + uses: mistachio/kernel/.github/workflows/static.yml@5.4.143-velinux secrets: ssh_key: ${{ secrets.SSH_KEY }} BuildAndTestKernel: - uses: bytedance/kernel/.github/workflows/build-and-test.yml@5.4.143-velinux + uses: mistachio/kernel/.github/workflows/build-and-test.yml@5.4.143-velinux secrets: ssh_key: ${{ secrets.SSH_KEY }} diff --git a/.github/workflows/static.yml b/.github/workflows/static.yml index ab1cfe84c1c21..22ce4858a416c 100644 --- a/.github/workflows/static.yml +++ b/.github/workflows/static.yml @@ -23,11 +23,11 @@ jobs: ssh-key: ${{ secrets.ssh_key }} set-safe-directory: true - name: FetchRefs - uses: bytedance/kernel/.github/actions/fetch-refs@5.4.143-velinux + uses: mistachio/kernel/.github/actions/fetch-refs@5.4.143-velinux with: depth: 2000 - name: PrepareCICode - uses: bytedance/kernel/.github/actions/prepare-ci-code@5.4.143-velinux + uses: mistachio/kernel/.github/actions/prepare-ci-code@5.4.143-velinux - name: CheckFormat run: | set -e @@ -43,11 +43,11 @@ jobs: ssh-key: ${{ secrets.ssh_key }} set-safe-directory: true - name: FetchRefs - uses: bytedance/kernel/.github/actions/fetch-refs@5.4.143-velinux + uses: mistachio/kernel/.github/actions/fetch-refs@5.4.143-velinux with: depth: 2000 - name: PrepareCICode - uses: bytedance/kernel/.github/actions/prepare-ci-code@5.4.143-velinux + uses: mistachio/kernel/.github/actions/prepare-ci-code@5.4.143-velinux - name: SearchFixes run: | set -e From 1bcaf1fcf84cc9800f355376468e5a0e4a03029c Mon Sep 17 00:00:00 2001 From: zengxianjun Date: Fri, 29 Nov 2024 17:03:41 +0800 Subject: [PATCH 3/6] support 6.6 with bookworm build --- .github/workflows/build-and-test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml index 7cd219383f7d1..83a8654ba0ef2 100644 --- a/.github/workflows/build-and-test.yml +++ b/.github/workflows/build-and-test.yml @@ -15,7 +15,7 @@ jobs: strategy: matrix: arch: [x86_64] - distro_code: [buster] + distro_code: ${{ contains('6.6', github.base_ref) && bookworm || buster }} steps: - name: Checkout uses: actions/checkout@v4 From 6df660b90ad4240d6b2d2519c03e16d610d6d504 Mon Sep 17 00:00:00 2001 From: zengxianjun Date: Fri, 29 Nov 2024 18:03:29 +0800 Subject: [PATCH 4/6] enable metrix --- .github/workflows/build-and-test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml index 83a8654ba0ef2..576f0f8b0e13c 100644 --- a/.github/workflows/build-and-test.yml +++ b/.github/workflows/build-and-test.yml @@ -15,7 +15,7 @@ jobs: strategy: matrix: arch: [x86_64] - distro_code: ${{ contains('6.6', github.base_ref) && bookworm || buster }} + distro_code: [buster, bookworm] steps: - name: Checkout uses: actions/checkout@v4 From 2cfe90b5c1c83ea17237b102c59e99df54d1964c Mon Sep 17 00:00:00 2001 From: zengxianjun Date: Fri, 29 Nov 2024 18:23:08 +0800 Subject: [PATCH 5/6] remove bookworm build --- .github/workflows/build-and-test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml index 576f0f8b0e13c..7cd219383f7d1 100644 --- a/.github/workflows/build-and-test.yml +++ b/.github/workflows/build-and-test.yml @@ -15,7 +15,7 @@ jobs: strategy: matrix: arch: [x86_64] - distro_code: [buster, bookworm] + distro_code: [buster] steps: - name: Checkout uses: actions/checkout@v4 From c54e7ba530ce1705a5461bb304b4d611bc9374c5 Mon Sep 17 00:00:00 2001 From: zengxianjun Date: Tue, 10 Dec 2024 10:54:48 +0800 Subject: [PATCH 6/6] Workflow supports for v6.6-kernel enable build dependencies for v6.6 kernel Signed-off-by: zengxianjun --- .github/code/configs/ltp-whitelist | 14 +++++++++----- .github/code/dockerfiles/x86_64-buster.dockerfile | 7 +++++++ .github/code/tests/ltp.yml | 6 +----- 3 files changed, 17 insertions(+), 10 deletions(-) diff --git a/.github/code/configs/ltp-whitelist b/.github/code/configs/ltp-whitelist index 8448667d1a58b..42172adb9a229 100644 --- a/.github/code/configs/ltp-whitelist +++ b/.github/code/configs/ltp-whitelist @@ -1,5 +1,9 @@ -ioctl03 -fanotify22 -ioprio_set03 -setsockopt08 -statx04 +execve06 execve06 +inotify12 inotify12 +fanotify14 fanotify14 +openat04 openat04 +semctl09 semctl09 +setsockopt09 setsockopt09 +splice07 splice07 +timerfd_settime02 timerfd_settime02 +wait403 wait403 diff --git a/.github/code/dockerfiles/x86_64-buster.dockerfile b/.github/code/dockerfiles/x86_64-buster.dockerfile index 27d40b3bb3cdf..5c4b78d130da7 100644 --- a/.github/code/dockerfiles/x86_64-buster.dockerfile +++ b/.github/code/dockerfiles/x86_64-buster.dockerfile @@ -41,6 +41,13 @@ RUN apt install -y python-dev RUN apt install -y python3-dev RUN apt install -y sshpass RUN apt install -y debhelper +RUN apt install -y libpci-dev +RUN apt install -y libcap-dev +RUN apt install -y systemtap-sdt-dev +RUN apt install -y libzstd-dev +RUN apt install -y libbabeltrace-dev +RUN apt install -y libpfm4-dev +ENV NO_LIBTRACEEVENT=1 # WA for install pahole>=1.13 RUN echo "deb http://deb.debian.org/debian bullseye main" >> /etc/apt/sources.list diff --git a/.github/code/tests/ltp.yml b/.github/code/tests/ltp.yml index c9e86f1567458..f0e20fabeae48 100644 --- a/.github/code/tests/ltp.yml +++ b/.github/code/tests/ltp.yml @@ -17,11 +17,7 @@ before_test: test: script: - | - if [ `uname -r | grep "6.6"` ]; then - /opt/ltp/runltp -p -d /ltp_log -l /ltp_log/result -o /ltp_log/output -C /ltp_log/failed -T /ltp_log/conf -f syscalls -S /opt/ltp_whitelist || true - else - /opt/ltp/runltp -p -d /ltp_log -l /ltp_log/result -o /ltp_log/output -C /ltp_log/failed -T /ltp_log/conf -f syscalls || true - fi + /opt/ltp/runltp -p -d /ltp_log -l /ltp_log/result -o /ltp_log/output -C /ltp_log/failed -T /ltp_log/conf -f syscalls -S /opt/ltp-whitelist || true - | if [ ! -f /ltp_log/failed ]; then exit 0