Re: [PATCH v2] drm/ci: uprev mesa, IGT and deqp-runner
On Tue, 10 Sep 2024 10:19:24 -0300 Vignesh Raman wrote --- > Uprev mesa, IGT to the latest version and deqp-runner > to v0.20.0. Also update expectation files. > > Acked-by: Helen Koike [email protected]> > Reviewed-by: Daniel Stone [email protected]> > Signed-off-by: Vignesh Raman [email protected]> Applied to drm-misc-next. Thanks! Helen > --- > > v1: > - Flaky test report will be sent to maintainers after this > patch series is reviewed. > > v2: > - Uprev mesa and rerun with latest drm-misc-next. > Updated flaky tests bug report link. > > --- > drivers/gpu/drm/ci/gitlab-ci.yml | 14 +++-- > drivers/gpu/drm/ci/image-tags.yml | 2 +- > .../gpu/drm/ci/xfails/amdgpu-stoney-fails.txt | 2 +- > .../drm/ci/xfails/amdgpu-stoney-flakes.txt| 7 +++ > drivers/gpu/drm/ci/xfails/i915-amly-fails.txt | 2 +- > .../gpu/drm/ci/xfails/i915-amly-flakes.txt| 7 +++ > drivers/gpu/drm/ci/xfails/i915-apl-fails.txt | 1 - > drivers/gpu/drm/ci/xfails/i915-apl-flakes.txt | 7 +++ > drivers/gpu/drm/ci/xfails/i915-cml-fails.txt | 10 ++-- > drivers/gpu/drm/ci/xfails/i915-cml-flakes.txt | 14 + > drivers/gpu/drm/ci/xfails/i915-glk-fails.txt | 1 + > drivers/gpu/drm/ci/xfails/i915-kbl-fails.txt | 2 - > drivers/gpu/drm/ci/xfails/i915-tgl-fails.txt | 34 ++-- > drivers/gpu/drm/ci/xfails/i915-whl-fails.txt | 9 ++-- > .../drm/ci/xfails/mediatek-mt8173-fails.txt | 11 +--- > .../drm/ci/xfails/mediatek-mt8183-fails.txt | 6 --- > .../gpu/drm/ci/xfails/meson-g12b-fails.txt| 1 - > .../gpu/drm/ci/xfails/msm-apq8016-fails.txt | 5 -- > .../gpu/drm/ci/xfails/msm-apq8096-fails.txt | 5 -- > .../msm-sc7180-trogdor-kingoftown-fails.txt | 27 -- > ...sm-sc7180-trogdor-lazor-limozeen-fails.txt | 27 -- > .../gpu/drm/ci/xfails/msm-sdm845-fails.txt| 6 +-- > .../gpu/drm/ci/xfails/msm-sdm845-flakes.txt | 14 + > .../gpu/drm/ci/xfails/msm-sdm845-skips.txt| 5 ++ > .../gpu/drm/ci/xfails/panfrost-g12b-fails.txt | 1 + > .../drm/ci/xfails/panfrost-mt8183-fails.txt | 1 + > .../drm/ci/xfails/panfrost-rk3288-fails.txt | 1 + > .../drm/ci/xfails/panfrost-rk3399-fails.txt | 1 + > .../drm/ci/xfails/rockchip-rk3288-fails.txt | 22 +--- > .../drm/ci/xfails/rockchip-rk3288-flakes.txt | 28 ++ > .../drm/ci/xfails/rockchip-rk3399-fails.txt | 7 --- > .../drm/ci/xfails/rockchip-rk3399-flakes.txt | 28 ++ > drivers/gpu/drm/ci/xfails/vkms-none-fails.txt | 21 > drivers/gpu/drm/ci/xfails/vkms-none-skips.txt | 53 +++ > 34 files changed, 234 insertions(+), 148 deletions(-) > > diff --git a/drivers/gpu/drm/ci/gitlab-ci.yml > b/drivers/gpu/drm/ci/gitlab-ci.yml > index eca47d4f816f..90bde9f00cc3 100644 > --- a/drivers/gpu/drm/ci/gitlab-ci.yml > +++ b/drivers/gpu/drm/ci/gitlab-ci.yml > @@ -1,14 +1,14 @@ > variables: > DRM_CI_PROJECT_PATH: &drm-ci-project-path mesa/mesa > - DRM_CI_COMMIT_SHA: &drm-ci-commit-sha > d9849ac46623797a9f56fb9d46dc52460ac477de > + DRM_CI_COMMIT_SHA: &drm-ci-commit-sha > c6a9a9c3bce90923f7700219354e0b6e5a3c9ba6 > > UPSTREAM_REPO: https://gitlab.freedesktop.org/drm/kernel.git > TARGET_BRANCH: drm-next > > - IGT_VERSION: f13702b8e4e847c56da3ef6f0969065d686049c5 > + IGT_VERSION: a73311079a5d8ac99eb25336a8369a2c3c6b519b > > DEQP_RUNNER_GIT_URL: https://gitlab.freedesktop.org/mesa/deqp-runner.git > - DEQP_RUNNER_GIT_TAG: v0.15.0 > + DEQP_RUNNER_GIT_TAG: v0.20.0 > > FDO_UPSTREAM_REPO: helen.fornazier/linux # The repo where the git-archive > daily runs > MESA_TEMPLATES_COMMIT: &ci-templates-commit > d5aa3941aa03c2f716595116354fb81eb8012acb > @@ -153,6 +153,14 @@ stages: > # Pre-merge pipeline for Marge Bot > - if: &is-pre-merge-for-marge '$GITLAB_USER_LOGIN == "marge-bot" && > $CI_PIPELINE_SOURCE == "merge_request_event"' > when: on_success > +# Push to a branch on a fork > +- &is-fork-push '$CI_PROJECT_NAMESPACE != "mesa" && $CI_PIPELINE_SOURCE > == "push"' > + > +# Rules applied to every job in the pipeline > +.common-rules: > + rules: > +- if: *is-fork-push > + when: manual > > .never-post-merge-rules: > rules: > diff --git a/drivers/gpu/drm/ci/image-tags.yml > b/drivers/gpu/drm/ci/image-tags.yml > index 2c340d063a96..8d8b9e71852e 100644 > --- a/drivers/gpu/drm/ci/image-tags.yml > +++ b/drivers/gpu/drm/ci/image-tags.yml > @@ -1,5 +1,5 @@ > variables: > - CONTAINER_TAG: "2024-08-07-mesa-uprev" > + CONTAINER_TAG: "2024-09-09-uprevs" > DEBIAN_X86_64_BUILD_BASE_IMAGE: "debian/x86_64_build-base" > DEBIAN_BASE_TAG: "${CONTAINER_TAG}" > > diff --git a/drivers/gpu/drm/ci/xfails/amdgpu-stoney-fails.txt > b/drivers/gpu/drm/ci/xfails/amdgpu-stoney-fails.txt > index 8e2fed6d76a
[PATCH v2] drm/ci: uprev mesa, IGT and deqp-runner
Uprev mesa, IGT to the latest version and deqp-runner
to v0.20.0. Also update expectation files.
Acked-by: Helen Koike
Reviewed-by: Daniel Stone
Signed-off-by: Vignesh Raman
---
v1:
- Flaky test report will be sent to maintainers after this
patch series is reviewed.
v2:
- Uprev mesa and rerun with latest drm-misc-next.
Updated flaky tests bug report link.
---
drivers/gpu/drm/ci/gitlab-ci.yml | 14 +++--
drivers/gpu/drm/ci/image-tags.yml | 2 +-
.../gpu/drm/ci/xfails/amdgpu-stoney-fails.txt | 2 +-
.../drm/ci/xfails/amdgpu-stoney-flakes.txt| 7 +++
drivers/gpu/drm/ci/xfails/i915-amly-fails.txt | 2 +-
.../gpu/drm/ci/xfails/i915-amly-flakes.txt| 7 +++
drivers/gpu/drm/ci/xfails/i915-apl-fails.txt | 1 -
drivers/gpu/drm/ci/xfails/i915-apl-flakes.txt | 7 +++
drivers/gpu/drm/ci/xfails/i915-cml-fails.txt | 10 ++--
drivers/gpu/drm/ci/xfails/i915-cml-flakes.txt | 14 +
drivers/gpu/drm/ci/xfails/i915-glk-fails.txt | 1 +
drivers/gpu/drm/ci/xfails/i915-kbl-fails.txt | 2 -
drivers/gpu/drm/ci/xfails/i915-tgl-fails.txt | 34 ++--
drivers/gpu/drm/ci/xfails/i915-whl-fails.txt | 9 ++--
.../drm/ci/xfails/mediatek-mt8173-fails.txt | 11 +---
.../drm/ci/xfails/mediatek-mt8183-fails.txt | 6 ---
.../gpu/drm/ci/xfails/meson-g12b-fails.txt| 1 -
.../gpu/drm/ci/xfails/msm-apq8016-fails.txt | 5 --
.../gpu/drm/ci/xfails/msm-apq8096-fails.txt | 5 --
.../msm-sc7180-trogdor-kingoftown-fails.txt | 27 --
...sm-sc7180-trogdor-lazor-limozeen-fails.txt | 27 --
.../gpu/drm/ci/xfails/msm-sdm845-fails.txt| 6 +--
.../gpu/drm/ci/xfails/msm-sdm845-flakes.txt | 14 +
.../gpu/drm/ci/xfails/msm-sdm845-skips.txt| 5 ++
.../gpu/drm/ci/xfails/panfrost-g12b-fails.txt | 1 +
.../drm/ci/xfails/panfrost-mt8183-fails.txt | 1 +
.../drm/ci/xfails/panfrost-rk3288-fails.txt | 1 +
.../drm/ci/xfails/panfrost-rk3399-fails.txt | 1 +
.../drm/ci/xfails/rockchip-rk3288-fails.txt | 22 +---
.../drm/ci/xfails/rockchip-rk3288-flakes.txt | 28 ++
.../drm/ci/xfails/rockchip-rk3399-fails.txt | 7 ---
.../drm/ci/xfails/rockchip-rk3399-flakes.txt | 28 ++
drivers/gpu/drm/ci/xfails/vkms-none-fails.txt | 21
drivers/gpu/drm/ci/xfails/vkms-none-skips.txt | 53 +++
34 files changed, 234 insertions(+), 148 deletions(-)
diff --git a/drivers/gpu/drm/ci/gitlab-ci.yml b/drivers/gpu/drm/ci/gitlab-ci.yml
index eca47d4f816f..90bde9f00cc3 100644
--- a/drivers/gpu/drm/ci/gitlab-ci.yml
+++ b/drivers/gpu/drm/ci/gitlab-ci.yml
@@ -1,14 +1,14 @@
variables:
DRM_CI_PROJECT_PATH: &drm-ci-project-path mesa/mesa
- DRM_CI_COMMIT_SHA: &drm-ci-commit-sha
d9849ac46623797a9f56fb9d46dc52460ac477de
+ DRM_CI_COMMIT_SHA: &drm-ci-commit-sha
c6a9a9c3bce90923f7700219354e0b6e5a3c9ba6
UPSTREAM_REPO: https://gitlab.freedesktop.org/drm/kernel.git
TARGET_BRANCH: drm-next
- IGT_VERSION: f13702b8e4e847c56da3ef6f0969065d686049c5
+ IGT_VERSION: a73311079a5d8ac99eb25336a8369a2c3c6b519b
DEQP_RUNNER_GIT_URL: https://gitlab.freedesktop.org/mesa/deqp-runner.git
- DEQP_RUNNER_GIT_TAG: v0.15.0
+ DEQP_RUNNER_GIT_TAG: v0.20.0
FDO_UPSTREAM_REPO: helen.fornazier/linux # The repo where the git-archive
daily runs
MESA_TEMPLATES_COMMIT: &ci-templates-commit
d5aa3941aa03c2f716595116354fb81eb8012acb
@@ -153,6 +153,14 @@ stages:
# Pre-merge pipeline for Marge Bot
- if: &is-pre-merge-for-marge '$GITLAB_USER_LOGIN == "marge-bot" &&
$CI_PIPELINE_SOURCE == "merge_request_event"'
when: on_success
+# Push to a branch on a fork
+- &is-fork-push '$CI_PROJECT_NAMESPACE != "mesa" && $CI_PIPELINE_SOURCE ==
"push"'
+
+# Rules applied to every job in the pipeline
+.common-rules:
+ rules:
+- if: *is-fork-push
+ when: manual
.never-post-merge-rules:
rules:
diff --git a/drivers/gpu/drm/ci/image-tags.yml
b/drivers/gpu/drm/ci/image-tags.yml
index 2c340d063a96..8d8b9e71852e 100644
--- a/drivers/gpu/drm/ci/image-tags.yml
+++ b/drivers/gpu/drm/ci/image-tags.yml
@@ -1,5 +1,5 @@
variables:
- CONTAINER_TAG: "2024-08-07-mesa-uprev"
+ CONTAINER_TAG: "2024-09-09-uprevs"
DEBIAN_X86_64_BUILD_BASE_IMAGE: "debian/x86_64_build-base"
DEBIAN_BASE_TAG: "${CONTAINER_TAG}"
diff --git a/drivers/gpu/drm/ci/xfails/amdgpu-stoney-fails.txt
b/drivers/gpu/drm/ci/xfails/amdgpu-stoney-fails.txt
index 8e2fed6d76a3..f44dbce3151a 100644
--- a/drivers/gpu/drm/ci/xfails/amdgpu-stoney-fails.txt
+++ b/drivers/gpu/drm/ci/xfails/amdgpu-stoney-fails.txt
@@ -2,6 +2,7 @@ amdgpu/amd_abm@abm_enabled,Fail
amdgpu/amd_abm@abm_gradual,Fail
amdgpu/amd_abm@backlight_monotonic_abm,Fail
amdgpu/amd_abm@backlight_monotonic_basic,Fail
+amdgpu/amd_abm@dpms_cycle,Fail
amdgpu/amd_assr@assr-links,Fail
amdgpu/amd_assr@assr-links-dpms,Fail
amdgpu/amd_mall@static-screen,Crash
@@ -14,7 +15,6 @@ amdgpu/amd_plane@mpo-scale-p010,Fail
amdgpu/amd_plane@mpo-scale-rgb,Crash
amdgpu/amd_plane@mpo-swizzle-toggle,Fail
amdg
