From patchwork Sun Dec 15 21:22:55 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Laurent Pinchart X-Patchwork-Id: 22318 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 5CC07C32F5 for ; Sun, 15 Dec 2024 21:23:18 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id 7993F67F1D; Sun, 15 Dec 2024 22:23:16 +0100 (CET) Authentication-Results: lancelot.ideasonboard.com; dkim=pass (1024-bit key; unprotected) header.d=ideasonboard.com header.i=@ideasonboard.com header.b="cwpvgQeF"; 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 AE76467F1C for ; Sun, 15 Dec 2024 22:23:12 +0100 (CET) Received: from pendragon.ideasonboard.com (81-175-209-231.bb.dnainternet.fi [81.175.209.231]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id 770B6A57; Sun, 15 Dec 2024 22:22:36 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1734297756; bh=9ILWxRHc0yJG1GOF3qXUGq57sre/94L6M8RZhazzDbI=; h=From:To:Cc:Subject:Date:From; b=cwpvgQeFQKL18iqMuQFq2U32QoWpOE+sEwv5NtLM2QivULknpWdlql2CwUUVhs9zp cT5l5VusNaL5S9Lld7+KM02hsafdn1eJDJCu0wSI5USqD0vWQAPJZlq3LjHdcQGrz7 4G7stPcRPwL2tCPnFohW/vVhhlCo+agPN7jMT2+c= From: Laurent Pinchart To: libcamera-devel@lists.libcamera.org Cc: =?utf-8?q?Barnab=C3=A1s_P=C5=91cze?= Subject: [libcamera-ci] [PATCH] Enable junit artifact generation for test-unit job Date: Sun, 15 Dec 2024 23:22:55 +0200 Message-ID: <20241215212255.20001-1-laurent.pinchart@ideasonboard.com> X-Mailer: git-send-email 2.45.2 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" Bump the minimum meson version to 1.2.0 to generate a proper junit report, and package it in artifacts in the test-unit job. Add the --break-system-packages to `pip3 install` for Debian bookworm and newer, as pip3 otherwise fails. Signed-off-by: Laurent Pinchart Reviewed-by: Jacopo Mondi Reviewed-by: Kieran Bingham --- Junit report output for unit tests: https://gitlab.freedesktop.org/pinchartl/libcamera/-/pipelines/1330345/test_report?job_name=test-unit --- .gitlab-ci/setup-container.sh | 11 ++++++++--- gitlab-ci.yml | 16 ++++++---------- 2 files changed, 14 insertions(+), 13 deletions(-) diff --git a/.gitlab-ci/setup-container.sh b/.gitlab-ci/setup-container.sh index d2909c7257d35b0d..6146bee4d55ea348 100755 --- a/.gitlab-ci/setup-container.sh +++ b/.gitlab-ci/setup-container.sh @@ -187,17 +187,22 @@ cbuild_fixups() { echo "Applying miscellaneous fixups" local min_version + local pip3_options local version + if [[ $FDO_DISTRIBUTION_VERSION != 'bullseye' ]] ; then + pip3_options=--break-system-packages + fi + # Install meson from pip. - min_version=1.0.1 + min_version=1.2.0 version=$(dpkg_version meson) if dpkg_check_version $version $min_version ; then echo "meson $version too old, installing $min_version from pip" apt remove -y meson apt install -y python3-pip - pip3 install meson==${min_version} + pip3 install ${pip3_options} meson==${min_version} fi # Install pygments from pip. @@ -207,7 +212,7 @@ cbuild_fixups() { echo "pygments $version too old, installing $min_version from pip" apt install -y python3-pip - pip3 install pygments==${min_version} + pip3 install ${pip3_options} pygments==${min_version} fi # Create pybind11.pc manually if not provided by the distribution diff --git a/gitlab-ci.yml b/gitlab-ci.yml index 06ab27dc0af0d9df..2b37b7ed59d4fbd0 100644 --- a/gitlab-ci.yml +++ b/gitlab-ci.yml @@ -59,17 +59,17 @@ include: .libcamera-ci.debian:11: variables: FDO_DISTRIBUTION_VERSION: 'bullseye' - FDO_DISTRIBUTION_TAG: '2024-11-05.1' + FDO_DISTRIBUTION_TAG: '2024-12-15.1' .libcamera-ci.debian:12: variables: FDO_DISTRIBUTION_VERSION: 'bookworm' - FDO_DISTRIBUTION_TAG: '2024-11-05.1' + FDO_DISTRIBUTION_TAG: '2024-12-15.1' .libcamera-ci.debian:13: variables: FDO_DISTRIBUTION_VERSION: 'trixie' - FDO_DISTRIBUTION_TAG: '2024-11-05.1' + FDO_DISTRIBUTION_TAG: '2024-12-15.1' .container-debian: extends: @@ -406,10 +406,6 @@ test-unit: -D qcam=disabled -D test=true -D v4l2=true - - # meson prior to 1.2.0 doesn't correctly escape non-printable characters - # when generating the testlog XML. This results in an unparseable file. - # Skip it for now. - # artifacts: - # reports: - # junit: build/meson-logs/testlog.junit.xml + artifacts: + reports: + junit: build/meson-logs/testlog.junit.xml