From patchwork Fri Dec 22 03:34:34 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vignesh Raman X-Patchwork-Id: 182517 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7300:2483:b0:fb:cd0c:d3e with SMTP id q3csp828837dyi; Thu, 21 Dec 2023 19:35:11 -0800 (PST) X-Google-Smtp-Source: AGHT+IHYlmaztL7/+fCH6ye56LNF9bDjBbU44xDeRcyf5hVPPzyKUWxGwaa9H6HGWhrWl+fEM+pf X-Received: by 2002:a17:907:1384:b0:a10:8db4:bcf3 with SMTP id vs4-20020a170907138400b00a108db4bcf3mr348947ejb.9.1703216110799; Thu, 21 Dec 2023 19:35:10 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1703216110; cv=none; d=google.com; s=arc-20160816; b=C1BRn/4r0yyVpAY8sGk++seLfo0hnmTwvE9L6sWYr9FMHFY4s3k7KBJf4jZkK8gcaE RxTBIAcLXhCpf6sbLR3PLSXJTSrzCCtBLLLbdNR7eVqPK4PrU5drpoHOg3nqtu20KguU YsHUsxNnw/lYRGXWXlCDw4lVU/9Wa0+Si720X02QZUdT0XJ0Vf3DFTn7V3B0sJv3Jhpp OLbydavYQVeylnA2YkvvF/Ogkr+VLgu+wqZ63y6pXwV1BXpTdGpqUl5ItXwRTWwBELZg a8qBrn6TKCYnXFzQdc+/o5/ryRx36lzFXI13eedPd0htBqER7ZwLfiyDE+tCmZTRN1X1 YQtw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:list-unsubscribe :list-subscribe:list-id:precedence:message-id:date:subject:cc:to :from:dkim-signature; bh=K9A2K6wd7fq5mVBzfDMnGxCE0E4baC8n7XE82zzR6eA=; fh=lKkHxVOBdL1G/WSG+9ftg6SnEWKbuJYaKlvyUjOjXms=; b=ADMrAay9o29abbIAt1Pd3Eh6z9SMp1m12JgwOHMBT/zfox5lkItVKec4gnIyaCOj3m N8OgoDVBNAwUbjQZbse9DsOabE/QvpL3+ZdvNQErsTLVqMzTOEDXvGFBcXUXY+Xz3vKh hlxrGT9NRG+LTwXcFdHV78EUNW4fum5gTvq9YDlIuVB7VA4TE75wid4Ax6LpoRq+tZuQ lHXDRpbtCE2Y0HdJNdcTbHdBPg4vg3y+a8o+fcaIFcxr6MLLT3xgDhWFlPuWV6DfLyA2 qJBslH0firgMtRjXunSeWPY7owedHw9zpSyPR65N6YfGSMC1Kit7yKYgM7CeXiykhCH0 UFbQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@collabora.com header.s=mail header.b="C5/5DCLf"; spf=pass (google.com: domain of linux-kernel+bounces-9293-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:4601:e00::3 as permitted sender) smtp.mailfrom="linux-kernel+bounces-9293-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=collabora.com Received: from am.mirrors.kernel.org (am.mirrors.kernel.org. [2604:1380:4601:e00::3]) by mx.google.com with ESMTPS id lu44-20020a170906faec00b00a24a3215a0dsi1419790ejb.883.2023.12.21.19.35.10 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 21 Dec 2023 19:35:10 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-9293-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:4601:e00::3 as permitted sender) client-ip=2604:1380:4601:e00::3; Authentication-Results: mx.google.com; dkim=pass header.i=@collabora.com header.s=mail header.b="C5/5DCLf"; spf=pass (google.com: domain of linux-kernel+bounces-9293-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:4601:e00::3 as permitted sender) smtp.mailfrom="linux-kernel+bounces-9293-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=collabora.com Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by am.mirrors.kernel.org (Postfix) with ESMTPS id 6AA151F21686 for ; Fri, 22 Dec 2023 03:35:10 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 0067B611B; Fri, 22 Dec 2023 03:34:57 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=collabora.com header.i=@collabora.com header.b="C5/5DCLf" X-Original-To: linux-kernel@vger.kernel.org Received: from madrid.collaboradmins.com (madrid.collaboradmins.com [46.235.227.194]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id A0D34257B for ; Fri, 22 Dec 2023 03:34:52 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=collabora.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=collabora.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=collabora.com; s=mail; t=1703216090; bh=kYml0Gc4mkk9AGwn9xZiP3xtZyxN1BrFoO4NDAvzy7M=; h=From:To:Cc:Subject:Date:From; b=C5/5DCLfh1RAXWeDcnqu/aZSxdB5pJ/kzz3a6epSwrhVHDEVQyK6YJiqY55KpAWAd fgnCixIt86jHLocC+6wPQi7nnWB3rimlS2L7S7yeQvDAj6rTsum+ZTn/J8frytzzuG qxwDC6IqNMQYsrIN3PSJe7xBn+f96WrwsKJeFFPSX1EMiSG9s2Kkd2L2ECM/aW4FQp RXjevOLKpCGyncC0IlYgnDUgPUlaAUi2gOtjhGperz1CLjTAx42v1V1Z7LJdNpjZq5 i3bLfK+l+7V7OzRtvxqTlkKguizCmMKuwjmgAXG/EM7dkO5Yhyf6K8Q8TBMCD9G40Q OpnNv/1TdDXAg== Received: from localhost.localdomain (cola.collaboradmins.com [195.201.22.229]) (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: vignesh) by madrid.collaboradmins.com (Postfix) with ESMTPSA id AF4A137813DA; Fri, 22 Dec 2023 03:34:45 +0000 (UTC) From: Vignesh Raman To: dri-devel@lists.freedesktop.org Cc: helen.koike@collabora.com, airlied@gmail.com, daniel@ffwll.ch, daniels@collabora.com, david.heidelberg@collabora.com, sergi.blanch.torne@collabora.com, guilherme.gallo@collabora.com, emma@anholt.net, robdclark@gmail.com, dmitry.baryshkov@linaro.org, quic_abhinavk@quicinc.com, freedreno@lists.freedesktop.org, linux-kernel@vger.kernel.org Subject: [PATCH v2] drm/ci: uprev mesa version: fix kdl commit fetch Date: Fri, 22 Dec 2023 09:04:34 +0530 Message-Id: <20231222033434.1537761-1-vignesh.raman@collabora.com> X-Mailer: git-send-email 2.40.1 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1785951536487172659 X-GMAIL-MSGID: 1785951536487172659 build-kdl.sh was doing a `clone --depth 1` of the default branch, then checking out a commit that might not be the latest of that branch, resulting in container build error. https://gitlab.freedesktop.org/mesa/mesa/-/commit/5efa4d56 fixes kdl commit fetch issue. Uprev mesa in drm-ci to fix this. This commit updates the kernel tag and adds .never-post-merge-rules due to the mesa uprev. It also fixes an issue where the virtio-gpu pipeline was not getting created with the mesa uprev. Reviewed-by: David Heidelberg Acked-by: Helen Koike Reviewed-by: Dmitry Baryshkov Tested-by: Abhinav Kumar Signed-off-by: Vignesh Raman --- v2: - Fix an issue where the virtio-gpu pipeline was not getting created with the mesa uprev https://gitlab.freedesktop.org/vigneshraman/linux/-/pipelines/1062221 --- drivers/gpu/drm/ci/gitlab-ci.yml | 14 ++++++++++++-- drivers/gpu/drm/ci/test.yml | 1 + 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/ci/gitlab-ci.yml b/drivers/gpu/drm/ci/gitlab-ci.yml index dac92cc2777c..084e3ff8e3f4 100644 --- a/drivers/gpu/drm/ci/gitlab-ci.yml +++ b/drivers/gpu/drm/ci/gitlab-ci.yml @@ -1,6 +1,6 @@ variables: DRM_CI_PROJECT_PATH: &drm-ci-project-path mesa/mesa - DRM_CI_COMMIT_SHA: &drm-ci-commit-sha edfbf74df1d4d6ce54ffe24566108be0e1a98c3d + DRM_CI_COMMIT_SHA: &drm-ci-commit-sha 9d162de9a05155e1c4041857a5848842749164cf UPSTREAM_REPO: git://anongit.freedesktop.org/drm/drm TARGET_BRANCH: drm-next @@ -25,7 +25,9 @@ variables: # 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 + KERNEL_REPO: "gfx-ci/linux" + KERNEL_TAG: "v6.6.4-for-mesa-ci-e4f4c500f7fb" + KERNEL_IMAGE_BASE: https://${S3_HOST}/mesa-lava/${KERNEL_REPO}/${KERNEL_TAG} LAVA_TAGS: subset-1-gfx LAVA_JOB_PRIORITY: 30 @@ -133,6 +135,11 @@ stages: - if: &is-pre-merge-for-marge '$GITLAB_USER_LOGIN == "marge-bot" && $CI_PIPELINE_SOURCE == "merge_request_event"' when: on_success +.never-post-merge-rules: + rules: + - if: *is-post-merge + when: never + # Rule to filter for only scheduled pipelines. .scheduled_pipeline-rules: rules: @@ -150,6 +157,7 @@ stages: .build-rules: rules: - !reference [.no_scheduled_pipelines-rules, rules] + - !reference [.never-post-merge-rules, rules] # Run automatically once all dependency jobs have passed - when: on_success @@ -157,6 +165,7 @@ stages: .container+build-rules: rules: - !reference [.no_scheduled_pipelines-rules, rules] + - !reference [.never-post-merge-rules, rules] - when: manual .ci-deqp-artifacts: @@ -175,6 +184,7 @@ stages: .container-rules: rules: - !reference [.no_scheduled_pipelines-rules, rules] + - !reference [.never-post-merge-rules, rules] # Run pipeline by default in the main project if any CI pipeline # configuration files were changed, to ensure docker images are up to date - if: *is-post-merge diff --git a/drivers/gpu/drm/ci/test.yml b/drivers/gpu/drm/ci/test.yml index 2c9a1838e728..1705f268547a 100644 --- a/drivers/gpu/drm/ci/test.yml +++ b/drivers/gpu/drm/ci/test.yml @@ -324,6 +324,7 @@ virtio_gpu:none: GPU_VERSION: none extends: - .test-gl + - .test-rules tags: - kvm script: