From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from bali.collaboradmins.com (bali.collaboradmins.com [148.251.105.195]) (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 009E126AABF for ; Fri, 28 Feb 2025 12:38:20 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=148.251.105.195 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740746303; cv=none; b=LPGFRcfOlps6erBOTYAHv4Mopq8K3dHfiRcf7+WvR/GVCdR+o58uoi0mXRd9b6ogE/Pf9pVuoT+O7mT1c/pdlkPGmsn003tjEQpPB2SCVJnMBuwbA4uASPKhT6l0x5PnMcktNMxe3EbLvfU45PFH9Mn2WfNT4fPilxl8OTty0QU= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740746303; c=relaxed/simple; bh=YiXSMEs1WmqmVHd09AJ85IwIatOEb4iEeGZ8qUBwlQY=; h=Message-ID:Date:MIME-Version:Subject:To:Cc:References:From: In-Reply-To:Content-Type; b=iTokm5p1liDE+BMXSSd0iU3CyHpBQvIPvjRHmgP3GtzJPhpQQlOu11YOYgTWvGBbbnLgSwF8fjhEBThRw/T2TTuHNaNVEaQBWwMRKexOQpHwNitsU1FZHCcqmiGKc775RVAPJfhll8WDmYo09kBnmQLgB28zpA9LQ31H71R/dBU= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=collabora.com; spf=pass smtp.mailfrom=collabora.com; dkim=pass (2048-bit key) header.d=collabora.com header.i=@collabora.com header.b=qIH0mDlE; arc=none smtp.client-ip=148.251.105.195 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=collabora.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=collabora.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=collabora.com header.i=@collabora.com header.b="qIH0mDlE" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=collabora.com; s=mail; t=1740746298; bh=YiXSMEs1WmqmVHd09AJ85IwIatOEb4iEeGZ8qUBwlQY=; h=Date:Subject:To:Cc:References:From:In-Reply-To:From; b=qIH0mDlEzvSZ+tfY8AXSKv4grR/j0uFU5EEsHKijdSUeXskyfoe8l6fp2CpdpVjjY uGc2GZdgSFhCqH/m5AeiAqZqCmJOlY5S1V2PaPpI6nTWJYwXIy7CLQDaWHhJOH8zRh 1vxsQUqI/wzpARKmP4kN25MB1KVZHlvIUEOhwcPNqAd4Z6Oqx6Rjwd85yPsRZCuNV9 G2IEJeB2l48p25WbrVkK/RXn0rFHW5Hrnw1wy26Xdfartkv1ucYmNqVU37C1gtVomm jomU1xvEYqYv22KPFKsuot7EeJQ/dq7KqM0NsCBot/qAgCHNjmmBRWLpRFBZ3adSqS CtYV8nLfjc7ng== Received: from [192.168.50.250] (unknown [171.76.85.20]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) (Authenticated sender: vignesh) by bali.collaboradmins.com (Postfix) with ESMTPSA id E30CF17E017D; Fri, 28 Feb 2025 13:38:15 +0100 (CET) Message-ID: Date: Fri, 28 Feb 2025 18:08:04 +0530 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH v2] drm/ci: fix merge request rules To: Dmitry Baryshkov Cc: dri-devel@lists.freedesktop.org, daniels@collabora.com, helen.fornazier@gmail.com, airlied@gmail.com, simona.vetter@ffwll.ch, robdclark@gmail.com, guilherme.gallo@collabora.com, sergi.blanch.torne@collabora.com, valentine.burley@collabora.com, linux-kernel@vger.kernel.org References: <20250227042058.409003-1-vignesh.raman@collabora.com> Content-Language: en-US From: Vignesh Raman In-Reply-To: Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit Hi Dmitry, On 28/02/25 12:28, Dmitry Baryshkov wrote: > On Thu, Feb 27, 2025 at 09:50:50AM +0530, Vignesh Raman 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. >> >> Run jobs automatically for marge-bot and scheduled >> pipelines, but in all other cases run manually. Also >> remove CI_PROJECT_NAMESPACE checks specific to mesa. >> >> Fixes: df54f04f2020 ("drm/ci: update gitlab rules") >> Signed-off-by: Vignesh Raman >> --- >> >> v2: >> - Run jobs automatically for marge-bot and scheduled >> pipelines, but in all other cases run manually. Also >> remove CI_PROJECT_NAMESPACE checks specific to mesa. >> >> --- >> drivers/gpu/drm/ci/gitlab-ci.yml | 21 +++++---------------- >> 1 file changed, 5 insertions(+), 16 deletions(-) >> >> diff --git a/drivers/gpu/drm/ci/gitlab-ci.yml b/drivers/gpu/drm/ci/gitlab-ci.yml >> index f04aabe8327c..f4e324e156db 100644 >> --- a/drivers/gpu/drm/ci/gitlab-ci.yml >> +++ b/drivers/gpu/drm/ci/gitlab-ci.yml >> @@ -143,11 +143,11 @@ stages: >> # Pre-merge pipeline >> - if: &is-pre-merge $CI_PIPELINE_SOURCE == "merge_request_event" >> # Push to a branch on a fork >> - - if: &is-fork-push $CI_PROJECT_NAMESPACE != "mesa" && $CI_PIPELINE_SOURCE == "push" >> + - if: &is-fork-push $CI_PIPELINE_SOURCE == "push" >> # nightly pipeline >> - if: &is-scheduled-pipeline $CI_PIPELINE_SOURCE == "schedule" >> # pipeline for direct pushes that bypassed the CI >> - - if: &is-direct-push $CI_PROJECT_NAMESPACE == "mesa" && $CI_PIPELINE_SOURCE == "push" && $GITLAB_USER_LOGIN != "marge-bot" >> + - if: &is-direct-push $CI_PIPELINE_SOURCE == "push" && $GITLAB_USER_LOGIN != "marge-bot" >> >> >> # Rules applied to every job in the pipeline >> @@ -170,26 +170,15 @@ 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: manual > > I believe there should be no dash on this line > >> # Build everything after someone bypassed the CI >> - if: *is-direct-push >> - when: on_success >> + - when: manual > > And on this line too. Thanks for spotting this. Will fix and send v3. Regards, Vignesh > >> # Build everything in scheduled pipelines >> - if: *is-scheduled-pipeline >> when: on_success >> -- >> 2.47.2 >> >