From patchwork Wed Sep 20 17:44:43 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Helen Mae Koike Fornazier X-Patchwork-Id: 13393110 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id B3157C04ABC for ; Wed, 20 Sep 2023 17:45:05 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id D3A7210E52D; Wed, 20 Sep 2023 17:45:04 +0000 (UTC) Received: from madras.collabora.co.uk (madras.collabora.co.uk [46.235.227.172]) by gabe.freedesktop.org (Postfix) with ESMTPS id 5274510E52D for ; Wed, 20 Sep 2023 17:45:02 +0000 (UTC) Received: from ginger.. (unknown [177.98.21.237]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) (Authenticated sender: koike) by madras.collabora.co.uk (Postfix) with ESMTPSA id 0E8C766071F1; Wed, 20 Sep 2023 18:44:56 +0100 (BST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=collabora.com; s=mail; t=1695231900; bh=iyG/zP8lsWiF85bEI9JxB8hb6fP+W/W/tsnhlVaZ8bE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=WSHrB/qXm8D0ocZ2VmfoJZhAHtFM52Ri7lmTj87RiAAiqjlWyUqRdHA+Oo9Tu2rFc gB9+TU/BESm9AVA/wcSorGpoQr2/A92NbAG8w1OfTyAd0+J2CpStqQQjnEMoT5/Xon of0UoQ20p9dg/N9/EkQZJFXLZGpXHpysGOtol7+Ss8RTVlUTIiEv4eftVZITgQosEI sSTLf12W9oJvtk3ow61khH31HaS7qpOrRwSWuLveK0acpsdOP7Wdljfc2MzUWCHj6R w7mG3wWzaEl68/UAGFofCZtxz+gpwlCEFzozJ6Wmpe5EUz/t26fNlgH+YossG/mDea 8XHcXhNtmV8lQ== From: Helen Koike To: dri-devel@lists.freedesktop.org Subject: [RFC PATCH 1/2] drm/ci: uprev mesa version - fix container build Date: Wed, 20 Sep 2023 14:44:43 -0300 Message-Id: <20230920174444.409586-2-helen.koike@collabora.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230920174444.409586-1-helen.koike@collabora.com> References: <20230920174444.409586-1-helen.koike@collabora.com> MIME-Version: 1.0 X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: mripard@kernel.org, rodrigosiqueiramelo@gmail.com, michel.daenzer@mailbox.org, vignesh.raman@collabora.com, linux-kernel@vger.kernel.org, melissa.srw@gmail.com, mairacanal@riseup.net Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" When building containers, some rust packages were installed without locking the dependencies version, which got updated and started giving errors like: error: failed to compile `bindgen-cli v0.62.0`, intermediate artifacts can be found at `/tmp/cargo-installkNKRwf` Caused by: package `rustix v0.38.13` cannot be built because it requires rustc 1.63 or newer, while the currently active rustc version is 1.60.0 A patch to Mesa was recently added fixing this error, so update it. Signed-off-by: Helen Koike --- I'm submitting this to make it available for other to run and test. I'd like to solve the TODO below (blocked on Mesa) before this is picked up. --- drivers/gpu/drm/ci/gitlab-ci.yml | 19 +++++++++++++++++-- drivers/gpu/drm/ci/lava-submit.sh | 2 +- 2 files changed, 18 insertions(+), 3 deletions(-) diff --git a/drivers/gpu/drm/ci/gitlab-ci.yml b/drivers/gpu/drm/ci/gitlab-ci.yml index 2c4df53f5dfe..73725070702b 100644 --- a/drivers/gpu/drm/ci/gitlab-ci.yml +++ b/drivers/gpu/drm/ci/gitlab-ci.yml @@ -1,6 +1,8 @@ variables: - DRM_CI_PROJECT_PATH: &drm-ci-project-path mesa/mesa - DRM_CI_COMMIT_SHA: &drm-ci-commit-sha 0dc961645c4f0241f8512cb0ec3ad59635842072 + # TODO: point back to mesa/mesa once the following issue is fixed: + # https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/25238 + DRM_CI_PROJECT_PATH: &drm-ci-project-path helen.fornazier/mesa + DRM_CI_COMMIT_SHA: &drm-ci-commit-sha inc-files UPSTREAM_REPO: git://anongit.freedesktop.org/drm/drm TARGET_BRANCH: drm-next @@ -24,6 +26,8 @@ variables: PIPELINE_ARTIFACTS_BASE: ${S3_HOST}/artifacts/${CI_PROJECT_PATH}/${CI_PIPELINE_ID} # per-job artifact storage on MinIO JOB_ARTIFACTS_BASE: ${PIPELINE_ARTIFACTS_BASE}/${CI_JOB_ID} + # default kernel for rootfs before injecting the current kernel tree + KERNEL_IMAGE_BASE: https://${S3_HOST}/mesa-lava/gfx-ci/linux/v6.4.12-for-mesa-ci-f6b4ad45f48d LAVA_JOB_PRIORITY: 30 @@ -86,6 +90,17 @@ include: - '/.gitlab-ci/container/gitlab-ci.yml' - '/.gitlab-ci/test/gitlab-ci.yml' - '/.gitlab-ci/lava/lava-gitlab-ci.yml' + - '/src/microsoft/ci/gitlab-ci-inc.yml' + - '/src/gallium/drivers/zink/ci/gitlab-ci-inc.yml' + - '/src/gallium/drivers/crocus/ci/gitlab-ci-inc.yml' + - '/src/gallium/drivers/softpipe/ci/gitlab-ci-inc.yml' + - '/src/gallium/drivers/llvmpipe/ci/gitlab-ci-inc.yml' + - '/src/gallium/drivers/virgl/ci/gitlab-ci-inc.yml' + - '/src/gallium/drivers/nouveau/ci/gitlab-ci-inc.yml' + - '/src/gallium/frontends/lavapipe/ci/gitlab-ci-inc.yml' + - '/src/intel/ci/gitlab-ci-inc.yml' + - '/src/freedreno/ci/gitlab-ci-inc.yml' + - '/src/amd/ci/gitlab-ci-inc.yml' - drivers/gpu/drm/ci/image-tags.yml - drivers/gpu/drm/ci/container.yml - drivers/gpu/drm/ci/static-checks.yml diff --git a/drivers/gpu/drm/ci/lava-submit.sh b/drivers/gpu/drm/ci/lava-submit.sh index 0c4456b21b0f..379f26ea87cc 100755 --- a/drivers/gpu/drm/ci/lava-submit.sh +++ b/drivers/gpu/drm/ci/lava-submit.sh @@ -22,7 +22,7 @@ cp "$SCRIPTS_DIR"/setup-test-env.sh results/job-rootfs-overlay/ # Prepare env vars for upload. section_start variables "Variables passed through:" -KERNEL_IMAGE_BASE_URL="https://${BASE_SYSTEM_HOST_PATH}" \ +KERNEL_IMAGE_BASE="https://${BASE_SYSTEM_HOST_PATH}" \ artifacts/ci-common/generate-env.sh | tee results/job-rootfs-overlay/set-job-env-vars.sh section_end variables