From patchwork Thu Jan 22 17:02:56 2026 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Barnab=C3=A1s_P=C5=91cze?= X-Patchwork-Id: 25942 Return-Path: X-Original-To: parsemail@patchwork.libcamera.org Delivered-To: parsemail@patchwork.libcamera.org Received: from lancelot.ideasonboard.com (lancelot.ideasonboard.com [92.243.16.209]) by patchwork.libcamera.org (Postfix) with ESMTPS id 7BBC2BDCBF for ; Thu, 22 Jan 2026 17:03:03 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id D543061FCB; Thu, 22 Jan 2026 18:03:02 +0100 (CET) Authentication-Results: lancelot.ideasonboard.com; dkim=pass (1024-bit key; unprotected) header.d=ideasonboard.com header.i=@ideasonboard.com header.b="Oba9mt8P"; dkim-atps=neutral Received: from perceval.ideasonboard.com (perceval.ideasonboard.com [IPv6:2001:4b98:dc2:55:216:3eff:fef7:d647]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id C4F7761F84 for ; Thu, 22 Jan 2026 18:03:00 +0100 (CET) Received: from pb-laptop.local (185.221.143.114.nat.pool.zt.hu [185.221.143.114]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id EC1C4460 for ; Thu, 22 Jan 2026 18:02:27 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1769101348; bh=ihIeH31P1gC5O9cqvjrUBx8SumI92j4N3HfQ4ID2DZY=; h=From:To:Subject:Date:From; b=Oba9mt8P3D9M0ZgXYIMnU8KWwpv4JrJdjJzSGInzlLC1YECt8exEQ+F+DL0pTD9kd ijbW037Q9deJzZGpf2BjbXT1SugEAQ/63+3TxM6YMaL9N780pbwep0I9ocK17/QZbB UBPOsyY9iWitc2XNM6tDhCdpSwJmtRsornARDSt4= From: =?utf-8?q?Barnab=C3=A1s_P=C5=91cze?= To: libcamera-devel@lists.libcamera.org Subject: [libcamera-ci] [PATCH v1] Move kvm tests and cross compilation to debian 13 Date: Thu, 22 Jan 2026 18:02:56 +0100 Message-ID: <20260122170256.4048314-1-barnabas.pocze@ideasonboard.com> X-Mailer: git-send-email 2.52.0 MIME-Version: 1.0 X-BeenThere: libcamera-devel@lists.libcamera.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libcamera-devel-bounces@lists.libcamera.org Sender: "libcamera-devel" Debian 13 is the current stable edition, and virtme-ng 1.18 no longer compiles on debian 12 due to rustc version incompatibilities. So move the kvm tests (and kernel compilation), as well as cross compilation tests to debian 13. Also update virtme-ng to the latest version (1.40), and remove the exit code workaround since the exit code is now propagated to the host[0]. Furthermore, the addition is `--overlay-rwdir` is necessary otherwise virtme-ng refuses to start: error: cannot initialize inside the guest (path must be defined inside a valid overlay) And moreover, since virtme-ng now creates an overlay for /tmp by default[1], and some tests require a /tmp with `O_TMPFILE` support, /tmp needs to be mounted as tmpfs before running the tests. Unfortunately, there is a debian peculiarity that has to be worked around. In contrast to debian 12, the `libclang-rt-dev` package does not exist for armhf. So its versioned variant needs to be used. [0]: https://github.com/arighi/virtme-ng/pull/61 [1]: https://github.com/arighi/virtme-ng/pull/114 Signed-off-by: Barnabás Pőcze --- .gitlab-ci/setup-container.sh | 12 ++++++------ .gitlab-ci/test-lc-compliance.sh | 5 ++--- .gitlab-ci/test-libcamera-qemu.sh | 10 +++++++--- gitlab-ci.yml | 22 +++++++++++----------- 4 files changed, 26 insertions(+), 23 deletions(-) -- 2.52.0 diff --git a/.gitlab-ci/setup-container.sh b/.gitlab-ci/setup-container.sh index 2ba94bb..3506271 100755 --- a/.gitlab-ci/setup-container.sh +++ b/.gitlab-ci/setup-container.sh @@ -132,9 +132,6 @@ case $FDO_DISTRIBUTION_VERSION in PKGS_LIBCAMERA_RUNTIME_MULTIARCH+=( libclang-rt-dev ) # For the Android camera HAL and the virtual pipeline handler. PKGS_LIBCAMERA_RUNTIME_MULTIARCH+=( libyuv-dev ) - # For cam and lc-compliance - # libevent-dev cannot be used here, see build-libcamera-common.sh - PKGS_LIBCAMERA_RUNTIME_MULTIARCH+=( libevent-2.1-7 libevent-pthreads-2.1-7 ) ;; 'trixie') # gcc 13 to expand compilation testing coverage. @@ -142,15 +139,18 @@ case $FDO_DISTRIBUTION_VERSION in # Sphinx theme for the documentation. PKGS_LIBCAMERA_RUNTIME+=( python3-sphinx-book-theme ) # libclang-rt-dev for the clang ASan runtime. - PKGS_LIBCAMERA_RUNTIME_MULTIARCH+=( libclang-rt-dev ) + PKGS_LIBCAMERA_RUNTIME_MULTIARCH+=( libclang-rt-19-dev ) # For the Android camera HAL and the virtual pipeline handler. PKGS_LIBCAMERA_RUNTIME_MULTIARCH+=( libyuv-dev ) + # For lc-compliance in the `test-lc-compliance:virtual` job + # libevent-dev cannot be used here, see build-libcamera-common.sh + PKGS_LIBCAMERA_RUNTIME_MULTIARCH+=( libevent-2.1-7t64 libevent-pthreads-2.1-7t64 ) ;; esac -# We use Debian bookworm containers to produce ARM binaries and run unit tests +# We use Debian 13 (trixie) containers to produce ARM binaries and run unit tests # with virtme, and other Debian versions for compilation-testing on amd64 only. -if [[ $FDO_DISTRIBUTION_VERSION == 'bookworm' ]] ; then +if [[ $FDO_DISTRIBUTION_VERSION == 'trixie' ]] ; then archs+=( arm64 armhf ) components['kernel']=1 components['virtme']=1 diff --git a/.gitlab-ci/test-lc-compliance.sh b/.gitlab-ci/test-lc-compliance.sh index 6208723..d4ae838 100755 --- a/.gitlab-ci/test-lc-compliance.sh +++ b/.gitlab-ci/test-lc-compliance.sh @@ -14,6 +14,7 @@ libcamera_compliance() { --verbose \ --skip-modules \ --force-9p \ + --overlay-rwdir "$PWD" \ --rwdir "$PWD/build" \ --run /opt/linux/bzImage \ --exec " \ @@ -25,12 +26,10 @@ libcamera_compliance() { UBSAN_OPTIONS=halt_on_error=1:abort_on_error=1:print_summary=1:print_stacktrace=1 \ GTEST_OUTPUT=xml:./build/lc-compliance-report.xml \ lc-compliance -c Virtual0; \ - echo \\\$? > ./build/.test-status; \ " - local status=$(cat build/.test-status) + local status=$? echo "Test result exit state: $status" - rm build/.test-status if [[ $status != 0 ]] ; then exit $status diff --git a/.gitlab-ci/test-libcamera-qemu.sh b/.gitlab-ci/test-libcamera-qemu.sh index f9de5ab..8a588a5 100755 --- a/.gitlab-ci/test-libcamera-qemu.sh +++ b/.gitlab-ci/test-libcamera-qemu.sh @@ -24,13 +24,17 @@ libcamera_unit_test() { echo "Running libcamera tests in a qemu VM" virtme-ng --verbose --skip-modules --force-9p \ + --overlay-rwdir "$PWD" \ --rwdir "$PWD/build" \ --run /opt/linux/bzImage \ - --exec "meson test -C build --no-rebuild --print-errorlogs; echo \\\$? > build/.test-status" + --exec " \ + set -ex; + mount -t tmpfs tmpfs /tmp/; + meson test -C build --no-rebuild --print-errorlogs; \ + " - local status=$(cat build/.test-status) + local status=$? echo "Test result exit state: $status" - rm build/.test-status if [[ $status != 0 ]] ; then exit $status diff --git a/gitlab-ci.yml b/gitlab-ci.yml index b1d5f0e..50fc6c6 100644 --- a/gitlab-ci.yml +++ b/gitlab-ci.yml @@ -34,7 +34,7 @@ variables: ca-certificates git VIRTME_GIT_URL: 'https://github.com/arighi/virtme-ng.git' - VIRTME_GIT_REF: 'v1.18' + VIRTME_GIT_REF: 'v1.40' # Jobs that test individual commits need more history to find the common # ancestor of the branch being tested and the default branch. Fetch up to 100 @@ -65,12 +65,12 @@ include: .libcamera-ci.debian:12: variables: FDO_DISTRIBUTION_VERSION: 'bookworm' - FDO_DISTRIBUTION_TAG: '2025-11-02.0' + FDO_DISTRIBUTION_TAG: '2026-01-22.0' .libcamera-ci.debian:13: variables: FDO_DISTRIBUTION_VERSION: 'trixie' - FDO_DISTRIBUTION_TAG: '2025-11-02.0' + FDO_DISTRIBUTION_TAG: '2026-01-22.0' .container-debian: extends: @@ -208,8 +208,6 @@ build-full:debian:12: ${MESON_ALL_OPTIONS} ${MESON_CLANG_OPTIONS} -D qcam=disabled - - ARCH: armhf - - ARCH: arm64 build-full:debian:13: extends: @@ -241,6 +239,8 @@ build-full:debian:13: -D cpp_debugstl=false # `cpp_debugstl=false` needed approximately between meson 1.4.0 and 1.9.3 # with clang 18 or later due to https://github.com/mesonbuild/meson/issues/13812 + - ARCH: armhf + - ARCH: arm64 # Build each commit in the branch individually to detect compilation breakages. build-history: @@ -267,11 +267,11 @@ build-history: build-package:debug: extends: - .fdo.distribution-image@debian - - .libcamera-ci.debian:12 + - .libcamera-ci.debian:13 - .libcamera-ci.scripts stage: build needs: - - job: container-debian:12 + - job: container-debian:13 artifacts: false script: - $CI_PROJECT_DIR/.gitlab-ci/build-libcamera.sh @@ -366,11 +366,11 @@ merge-check: test-unit: extends: - .fdo.distribution-image@debian - - .libcamera-ci.debian:12 + - .libcamera-ci.debian:13 - .libcamera-ci.scripts stage: test needs: - - job: container-debian:12 + - job: container-debian:13 artifacts: false tags: - kvm @@ -404,7 +404,7 @@ test-unit: test-lc-compliance:virtual: extends: - .fdo.distribution-image@debian - - .libcamera-ci.debian:12 + - .libcamera-ci.debian:13 - .libcamera-ci.scripts stage: test needs: @@ -412,7 +412,7 @@ test-lc-compliance:virtual: parallel: matrix: - ARCH: amd64 - - job: container-debian:12 + - job: container-debian:13 artifacts: false tags: - kvm