Staging PR 2987

Author: Staging script

config/core/rootfs-configs.yaml

@@ -383,28 +383,6 @@ rootfs_configs:
       - e2fsprogs
     script: "scripts/bookworm-libhugetlbfs.sh"
 
-  bookworm-ltp:
-    rootfs_type: debos
-    debian_release: bookworm
-    arch_list:
-      - amd64
-      - arm64
-      - armhf
-    extra_packages:
-      - ca-certificates
-      - curl
-      - dosfstools
-      - gdb-minimal
-      - iproute2
-      - jq
-      - libnuma-dev
-      - net-tools
-      - ntfs-3g
-      - python3
-    script: "scripts/bookworm-ltp.sh"
-    imagesize: 2GB
-    debos_memory: 8G
-
   bookworm-rt:
     rootfs_type: debos
     debian_release: bookworm
@@ -520,3 +498,26 @@ rootfs_configs:
       - x86
     frags:
       - baseline
+
+  trixie-ltp:
+    rootfs_type: debos
+    debian_release: trixie
+    arch_list:
+      - amd64
+      - arm64
+      - armhf
+    extra_packages:
+      - ca-certificates
+      - curl
+      - dosfstools
+      - gdb-minimal
+      - iproute2
+      - jq
+      - libnuma-dev
+      - net-tools
+      - ntfs-3g
+      - python3
+    script: "scripts/trixie-ltp.sh"
+    imagesize: 2GB
+    debos_memory: 8G
+

config/rootfs/debos/scripts/bookworm-ltp.sh

@@ -5,10 +5,10 @@
 set -e
 
 LTP_URL="https://github.com/linux-test-project/ltp.git"
-LTP_SHA=20250530
+LTP_SHA=20250930
 
 # Version of Kirk to install
-KIRK_VERSION=cdc81ed
+KIRK_VERSION=v2.3
 
 # Build-depends needed to build the test suites, they'll be removed later
 BUILD_DEPS="\

config/rootfs/debos/scripts/trixie-ltp.sh

@@ -0,0 +1,91 @@
+#!/bin/bash
+
+# Important: This script is run under QEMU
+
+set -e
+
+LTP_URL="https://github.com/linux-test-project/ltp.git"
+LTP_SHA=20250530
+
+# Version of Kirk to install
+KIRK_VERSION=cdc81ed
+
+# Build-depends needed to build the test suites, they'll be removed later
+BUILD_DEPS="\
+    gcc \
+    git \
+    make \
+    pkgconf \
+    autoconf \
+    automake \
+    bison \
+    flex \
+    m4 \
+    libc6-dev \
+    libnuma-dev \
+"
+
+apt-get install --no-install-recommends -y  ${BUILD_DEPS}
+
+BUILD_DIR="/ltp"
+BUILDFILE=/test_suites.json
+echo '{  "tests_suites": [' >> $BUILDFILE
+
+########################################################################
+# Build and install tests                                              #
+########################################################################
+mkdir -p ${BUILD_DIR} && cd ${BUILD_DIR}
+
+git config --global http.sslverify false
+
+echo '    {"name": "ltp-tests", "git_url": "'$LTP_URL'", "git_commit": "'$LTP_SHA'" }' >> $BUILDFILE
+echo '  ]}' >> $BUILDFILE
+
+git clone -b ${LTP_SHA} ${LTP_URL}
+cd ltp
+
+# See https://github.com/kernelci/kernelci-core/issues/948
+echo -e "\
+diff --git a/testcases/open_posix_testsuite/bin/run-posix-option-group-test.sh b/testcases/open_posix_testsuite/bin/run-posix-option-group-test.sh
+index 1bbdddfd5..de84b9e6f 100755
+--- a/testcases/open_posix_testsuite/bin/run-posix-option-group-test.sh
++++ b/testcases/open_posix_testsuite/bin/run-posix-option-group-test.sh
+@@ -25,7 +25,7 @@ run_option_group_tests()
+ {
+\tlocal list_of_tests
+
+-\tlist_of_tests=\`find \$1 -name '*.run-test' | sort\`
++\tlist_of_tests=\`find \$1 -name run.sh | sort\`
+
+\tif [ -z \"\$list_of_tests\" ]; then
+\t\techo \".run-test files not found under \$1, have been the tests compiled?\"
+" | patch -p1
+
+NBCPU=$(grep ^processor /proc/cpuinfo | wc -l)
+
+make autotools
+./configure
+make all -j$NBCPU
+find . -executable -type f -exec strip {} \;
+make install
+
+cd testcases/open_posix_testsuite/ && ./configure
+make all -j$NBCPU
+make install prefix=/opt/ltp
+
+########################################################################
+# Install kirk                                                         #
+########################################################################
+
+git clone https://github.com/linux-test-project/kirk /opt/kirk
+cd /opt/kirk
+git reset --hard $KIRK_VERSION
+rm -rf ./.git
+
+########################################################################
+# Cleanup: remove files and packages we don't want in the images       #
+########################################################################
+
+rm -rf ${BUILD_DIR}
+apt-get autoremove --purge -y ${BUILD_DEPS}
+apt-get clean