[PATCH v1] drm/ci: fix merge request rules

[PATCH v1] drm/ci: fix merge request rules

[Vignesh Raman]

Merge request pipelines were only created when changes
were made to drivers/gpu/drm/ci/, causing MRs that didn't
touch this path to break. Fix MR pipeline rules to trigger
jobs for all changes.

Fixes: df54f04f2020 ("drm/ci: update gitlab rules")
Signed-off-by: Vignesh Raman <vignesh.raman@collabora.com>
---
 drivers/gpu/drm/ci/gitlab-ci.yml | 15 ++-------------
 1 file changed, 2 insertions(+), 13 deletions(-)

diff --git a/drivers/gpu/drm/ci/gitlab-ci.yml b/drivers/gpu/drm/ci/gitlab-ci.yml
index f04aabe8327c..3991cd36af5f 100644
--- a/drivers/gpu/drm/ci/gitlab-ci.yml
+++ b/drivers/gpu/drm/ci/gitlab-ci.yml
@@ -170,23 +170,12 @@ stages:
     - !reference [.disable-farm-mr-rules, rules]
     # Never run immediately after merging, as we just ran everything
     - !reference [.never-post-merge-rules, rules]
-    # Build everything in merge pipelines, if any files affecting the pipeline
-    # were changed
+    # Build everything in merge pipelines
     - if: *is-merge-attempt
-      changes: &all_paths
-      - drivers/gpu/drm/ci/**/*
       when: on_success
     # Same as above, but for pre-merge pipelines
     - if: *is-pre-merge
-      changes:
-        *all_paths
-      when: manual
-    # Skip everything for pre-merge and merge pipelines which don't change
-    # anything in the build
-    - if: *is-merge-attempt
-      when: never
-    - if: *is-pre-merge
-      when: never
+      when: on_success
     # Build everything after someone bypassed the CI
     - if: *is-direct-push
       when: on_success
-- 
2.47.2

Re: [PATCH v1] drm/ci: fix merge request rules

[Daniel Stone]

Hi Vignesh,

On Wed, 26 Feb 2025 at 13:55, Vignesh Raman <vignesh.raman@collabora.com> wrote:
> Merge request pipelines were only created when changes
> were made to drivers/gpu/drm/ci/, causing MRs that didn't
> touch this path to break. Fix MR pipeline rules to trigger
> jobs for all changes.

Thanks a lot for fixing this up!

>      # Build everything after someone bypassed the CI
>      - if: *is-direct-push
>        when: on_success

Should these be when: manual? I think it would be good to align with
the rules we have for Mesa: run automatically for marge-bot and also
for scheduled pipelines, but in all other cases (MR context but not
scheduled for merge, direct push to ref, etc) be manual, so we don't
overwhelm the CI by testing everything everyone pushed.

Cheers,
Daniel

Re: [PATCH v1] drm/ci: fix merge request rules

[Vignesh Raman]

Hi Daniel,

On 26/02/25 19:29, Daniel Stone wrote:
> Hi Vignesh,
> 
> On Wed, 26 Feb 2025 at 13:55, Vignesh Raman <vignesh.raman@collabora.com> wrote:
>> Merge request pipelines were only created when changes
>> were made to drivers/gpu/drm/ci/, causing MRs that didn't
>> touch this path to break. Fix MR pipeline rules to trigger
>> jobs for all changes.
> 
> Thanks a lot for fixing this up!
> 
>>       # Build everything after someone bypassed the CI
>>       - if: *is-direct-push
>>         when: on_success
> 
> Should these be when: manual? I think it would be good to align with
> the rules we have for Mesa: run automatically for marge-bot and also
> for scheduled pipelines, but in all other cases (MR context but not
> scheduled for merge, direct push to ref, etc) be manual, so we don't
> overwhelm the CI by testing everything everyone pushed.

mesa has on_success for is-direct-push. Should we change it to manual 
here and update the same in mesa ?

If a user creates a MR, should the jobs run automatically, since we do 
not use marge-bot to merge MRs in drm?

I also noticed we need to remove reference to mesa 
(CI_PROJECT_NAMESPACE). I will send v2 with this change.

Regards,
Vignesh

> 
> Cheers,
> Daniel