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 also updates the kernel tag and adds .never-post-merge-rules
due to the mesa uprev.
Tested-by: Abhinav Kumar <[email protected]>
Signed-off-by: Vignesh Raman <[email protected]>
---
drivers/gpu/drm/ci/gitlab-ci.yml | 14 ++++++++++++--
1 file changed, 12 insertions(+), 2 deletions(-)
diff --git a/drivers/gpu/drm/ci/gitlab-ci.yml b/drivers/gpu/drm/ci/gitlab-ci.yml
index aeb9bab1b069..b215d7b3d6ca 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
--
2.40.1
On Tue, 12 Dec 2023 at 18:04, Vignesh Raman <[email protected]> wrote:
>
> 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 also updates the kernel tag and adds .never-post-merge-rules
> due to the mesa uprev.
>
> Tested-by: Abhinav Kumar <[email protected]>
> Signed-off-by: Vignesh Raman <[email protected]>
Reviewed-by: Dmitry Baryshkov <[email protected]>
> ---
> drivers/gpu/drm/ci/gitlab-ci.yml | 14 ++++++++++++--
> 1 file changed, 12 insertions(+), 2 deletions(-)
--
With best wishes
Dmitry
On 14/12/2023 05:00, Dmitry Baryshkov wrote:
> On Tue, 12 Dec 2023 at 18:04, Vignesh Raman <[email protected]> wrote:
>>
>> 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 also updates the kernel tag and adds .never-post-merge-rules
>> due to the mesa uprev.
>>
>> Tested-by: Abhinav Kumar <[email protected]>
>> Signed-off-by: Vignesh Raman <[email protected]>
>
> Reviewed-by: Dmitry Baryshkov <[email protected]>
Acked-by: Helen Koike <[email protected]>
Thanks
Helen
>
>> ---
>> drivers/gpu/drm/ci/gitlab-ci.yml | 14 ++++++++++++--
>> 1 file changed, 12 insertions(+), 2 deletions(-)
>
Hi,
On 14/12/23 17:50, Helen Koike wrote:
>
>
> On 14/12/2023 05:00, Dmitry Baryshkov wrote:
>> On Tue, 12 Dec 2023 at 18:04, Vignesh Raman
>> <[email protected]> wrote:
>>>
>>> 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 also updates the kernel tag and adds .never-post-merge-rules
>>> due to the mesa uprev.
>>>
>>> Tested-by: Abhinav Kumar <[email protected]>
>>> Signed-off-by: Vignesh Raman <[email protected]>
>>
>> Reviewed-by: Dmitry Baryshkov <[email protected]>
>
> Acked-by: Helen Koike <[email protected]>
>
With this mesa uprev, the virtio-gpu jobs are not getting created and
other jobs are not affected. The issue is identified and fixed, will be
sending a v2.
Regards,
Vignesh