fix(gitlab): enable skip-CI for merge requests by theakshaypant · Pull Request #2405 · tektoncd/pipelines-as-code

theakshaypant · 2026-01-21T12:52:23Z

📝 Description of the Change

Skip-CI detection was not working for GitLab because the sinker only fetched commit info for pull_request events and SHAMessage was not populated during payload parsing.

👨🏻‍ Linked Jira

https://issues.redhat.com/browse/SRVKP-10440

🔗 Linked GitHub Issue

N/A

🚀 Type of Change

🧪 Testing Strategy

🤖 AI Assistance

I have not used any AI assistance for this PR.
I have used AI assistance for this PR.

If you have used AI assistance, please provide the following details:

Which LLM was used?

Extent of AI Assistance:

Documentation and research only
Unit tests or E2E tests only
Code generation (parts of the code)
Full code generation (most of the PR)
PR description and comments
Commit message(s)

Important

If the majority of the code in this PR was generated by an AI, please add a Co-authored-by trailer to your commit message.
For example:

Co-authored-by: Gemini gemini@google.com
Co-authored-by: ChatGPT noreply@chatgpt.com
Co-authored-by: Claude noreply@anthropic.com
Co-authored-by: Cursor noreply@cursor.com
Co-authored-by: Copilot Copilot@users.noreply.github.com

**💡You can use the script ./hack/add-llm-coauthor.sh to automatically add
these co-author trailers to your commits.

✅ Submitter Checklist

gemini-code-assist · 2026-01-21T12:52:39Z

Summary of Changes

Hello @theakshaypant, I'm Gemini Code Assist¹! I'm currently reviewing this pull request and will post my feedback shortly. In the meantime, here's a summary to help you and other reviewers quickly get up to speed!

This pull request resolves a critical bug in the GitLab integration that prevented the skip-CI feature from functioning correctly for merge requests. The fix involves updating the event processing logic to recognize GitLab's "Merge Request" event type and ensuring that the commit message is properly extracted and stored, allowing the skip-CI command to be accurately detected and applied.

Highlights

GitLab Skip-CI Fix: Corrected an issue preventing skip-CI detection from working for GitLab merge requests.
Event Type Expansion: Extended the sinker to fetch commit information for both "pull_request" and "Merge Request" event types.
SHAMessage Population: Ensured the SHAMessage field is populated during GitLab payload parsing to make the commit message available for skip-CI checks.
Consistent Skip-CI Check: Modified the GitLab provider's GetCommitInfo to consistently use runevent.SHAMessage for skip-CI detection.

Using Gemini Code Assist

The full guide for Gemini Code Assist can be found on our documentation page, here are some quick tips.

Invoking Gemini

You can request assistance from Gemini at any point by creating a comment using either /gemini <command> or @gemini-code-assist <command>. Below is a summary of the supported commands on the current page.

Feature	Command	Description
Code Review	`/gemini review`	Performs a code review for the current pull request in its current state.
Pull Request Summary	`/gemini summary`	Provides a summary of the current pull request in its current state.
Comment	@gemini-code-assist	Responds in comments when explicitly tagged, both in pull request comments and review comments.
Help	`/gemini help`	Displays a list of available commands.

Customization

To customize Gemini Code Assist for GitHub experience, repository maintainers can create a configuration file and/or provide a custom code review style guide (such as PEP-8 for Python) by creating and adding files to a .gemini/ folder in the base of the repository. Detailed instructions can be found here.

Limitations & Feedback

Gemini Code Assist may make mistakes. Please leave feedback on any instances where its feedback is incorrect or counter productive. You can react with 👍 and 👎 on @gemini-code-assist comments. If you're interested in giving your feedback about your experience with Gemini Code Assist for Github and other Google products, sign up here.

You can also get AI-powered code generation, chat, as well as code reviews directly in the IDE at no cost with the Gemini Code Assist IDE Extension.

Review the Privacy Notices, Generative AI Prohibited Use Policy, Terms of Service, and learn how to configure Gemini Code Assist in GitHub here. Gemini can make mistakes, so double check it and use code with caution. ↩

pipelines-as-code · 2026-01-21T12:53:03Z

🔍 PR Lint Feedback

Note: This automated check helps ensure your PR follows our contribution guidelines.

⚠️ Items that need attention:

🤖 AI attribution

The following commits lack an explicit AI attribution footer:

5a7a9b7 fix(gitlab): enable skip-CI for merge requests

If no AI assistance was used for a commit, you can ignore this warning.
Otherwise add an Assisted-by: or Co-authored-by: footer referencing the AI used.

ℹ️ Next Steps

Review and address the items above
Push new commits to update this PR
This comment will be automatically updated when issues are resolved

🔧 Admin Tools (click to expand)

Automated Issue/Ticket Creation:

/issue-create - Generate a GitHub issue from this PR content using AI
/jira-create - Create a SRVKP Jira ticket from this PR content using AI

⚠️ Important: Always review and edit generated content before finalizing tickets/issues.
The AI-generated content should be used as a starting point and may need adjustments.

These commands are available to maintainers and will post the generated content as PR comments for review.

_{🤖 This feedback was generated automatically by the PR CI system}

gemini-code-assist

Code Review

This pull request aims to enable [skip ci] functionality for GitLab merge requests. The changes to include the "Merge Request" event type are correct. However, there's an issue in how the commit message is being parsed from the GitLab payload. It's currently using the commit title instead of the full commit message, which will prevent [skip ci] from working if the directive is in the commit body. I've added a specific comment with a suggested fix for this.

gemini-code-assist · 2026-01-21T13:00:49Z

pkg/provider/gitlab/parse_payload.go

 		processedEvent.SHA = gitEvent.ObjectAttributes.LastCommit.ID
 		processedEvent.SHAURL = gitEvent.ObjectAttributes.LastCommit.URL
 		processedEvent.SHATitle = gitEvent.ObjectAttributes.LastCommit.Title
+		processedEvent.SHAMessage = gitEvent.ObjectAttributes.LastCommit.Title


The SHAMessage is being populated from LastCommit.Title, which only contains the subject line of the commit. To correctly detect [skip ci] directives, which may be in the commit body, you should use LastCommit.Message to get the full commit message. The GitLab merge request event payload includes the full message in this field.

Suggested change

processedEvent.SHAMessage = gitEvent.ObjectAttributes.LastCommit.Title

processedEvent.SHAMessage = gitEvent.ObjectAttributes.LastCommit.Message

is that by design?

if this is by design then test it explictely for it, and please explain with a comment why

Ask❓

is that by design?

Answer:

No — populating SHAMessage from LastCommit.Title is very likely not “by design” for skip-CI detection; it’s more a pragmatic workaround to ensure SHAMessage is non-empty for GitLab merge request events.

In GitLab, LastCommit.Title is only the subject line. Skip directives like [skip ci] / [ci skip] are commonly placed in the full commit message (subject or body). If we only store the title, we can miss valid skip directives present in the body, which defeats the purpose of fixing skip-CI for MRs.

Given the PR description (“SHAMessage was not populated during payload parsing”), the intended design seems to be:

SHATitle = subject/title

SHAMessage = full commit message (subject + body) used by provider.SkipCI(...)

So I’d recommend setting:

processedEvent.SHAMessage = gitEvent.ObjectAttributes.LastCommit.Message

(falling back to Title only if Message is empty/unavailable), to align with the semantics of SHAMessage and make skip-CI detection robust.

Code Implementation 🛠️

Implementation: Populate SHAMessage from the full GitLab commit message (with a safe fallback to the title) and add an inline comment explaining it is required for skip-CI detection which can be in the commit body.

Suggested change

processedEvent.SHAMessage = gitEvent.ObjectAttributes.LastCommit.Title

// Use the full commit message (not only the subject/title) so directives like `[skip ci]`

// present in the commit body can be detected reliably.

processedEvent.SHAMessage = strings.TrimSpace(gitEvent.ObjectAttributes.LastCommit.Message)

if processedEvent.SHAMessage == "" {

processedEvent.SHAMessage = gitEvent.ObjectAttributes.LastCommit.Title

}

See review comment here

Fixed in 6ecaebd

theakshaypant · 2026-01-22T06:23:55Z

/retest

zakisk · 2026-01-22T09:25:39Z

pkg/adapter/sinker.go

 		// For PULL REQUEST events: commit message needs to be fetched via API
 		// Get commit info for skip-CI detection (only if we successfully set up client above)
-		if s.event.EventType == "pull_request" && repo != nil {
+		if (s.event.EventType == "pull_request" || s.event.EventType == "Merge Request") && repo != nil {


Suggested change

if (s.event.EventType == "pull_request" || s.event.EventType == "Merge Request") && repo != nil {

if (s.event.EventType == "pull_request" || s.event.EventType == "Merge_Request") && repo != nil {

I think its Merge_Request

Checked that it is Merge Request as fetched from the header. Attaching a payload header for reference.
We remove the " Hook" suffix in parse_payload.

zakisk · 2026-01-22T09:26:51Z

pkg/provider/gitlab/parse_payload.go

 		processedEvent.SHA = gitEvent.ObjectAttributes.LastCommit.ID
 		processedEvent.SHAURL = gitEvent.ObjectAttributes.LastCommit.URL
 		processedEvent.SHATitle = gitEvent.ObjectAttributes.LastCommit.Title
+		processedEvent.SHAMessage = gitEvent.ObjectAttributes.LastCommit.Message


it may be both SHATitle + SHAMessage?

Title is a substring (first line only) of the Message

Skip-CI detection was not working for GitLab because the sinker only fetched commit info for pull_request events and SHAMessage was not populated during payload parsing. Jira: https://issues.redhat.com/browse/SRVKP-10440 Signed-off-by: Akshay Pant <akshay.akshaypant@gmail.com>

theakshaypant · 2026-01-27T11:37:03Z

/review

qodo-code-review · 2026-01-27T11:37:21Z

PR Reviewer Guide 🔍

Here are some key observations to aid the review process:

⏱️ Estimated effort to review: 2 🔵🔵⚪⚪⚪
🧪 No relevant tests
🔒 No security concerns identified
⚡ Recommended focus areas for review Event Type Match The skip-CI commit-info fetch now triggers for `pull_request` or `Merge Request`. Verify the event type values are consistent across providers (case/spacing) and won’t miss GitLab merge request events (or accidentally trigger on unexpected strings). Consider centralizing to constants/enums or normalizing before comparison. // For PULL REQUEST events: commit message needs to be fetched via API // Get commit info for skip-CI detection (only if we successfully set up client above) if (s.event.EventType == "pull_request" \|\| s.event.EventType == "Merge Request") && repo != nil { // Get commit info (including commit message) via API if err := s.vcx.GetCommitInfo(ctx, s.event); err != nil { return fmt.Errorf("could not get commit info: %w", err) Skip-CI Source `HasSkipCommand` is now computed from `runevent.SHAMessage` instead of `branchinfo.Message`. Confirm `SHAMessage` is always populated before calling `GetCommitInfo` (for all relevant GitLab event types) and that `branchinfo.Message` is not the only reliable source in some paths (e.g., when API returns message but payload doesn’t). if branchinfo.AuthoredDate != nil { runevent.SHAAuthorDate = branchinfo.AuthoredDate } runevent.SHACommitterName = branchinfo.CommitterName runevent.SHACommitterEmail = branchinfo.CommitterEmail if branchinfo.CommittedDate != nil { runevent.SHACommitterDate = branchinfo.CommittedDate } } runevent.HasSkipCommand = provider.SkipCI(runevent.SHAMessage) return nil Payload Coverage Merge request payload parsing now sets `SHAMessage` from `LastCommit.Message`. Validate that this field is present for all MR webhook variants (and not empty/truncated), and ensure other GitLab events that rely on skip-CI detection also populate `SHAMessage` or fetch commit info accordingly. case *gitlab.MergeEvent: // Organization: event.GetRepo().GetOwner().GetLogin(), processedEvent.Sender = gitEvent.User.Username processedEvent.DefaultBranch = gitEvent.Project.DefaultBranch processedEvent.URL = gitEvent.Project.WebURL processedEvent.SHA = gitEvent.ObjectAttributes.LastCommit.ID processedEvent.SHAURL = gitEvent.ObjectAttributes.LastCommit.URL processedEvent.SHATitle = gitEvent.ObjectAttributes.LastCommit.Title processedEvent.SHAMessage = gitEvent.ObjectAttributes.LastCommit.Message processedEvent.HeadBranch = gitEvent.ObjectAttributes.SourceBranch processedEvent.BaseBranch = gitEvent.ObjectAttributes.TargetBranch processedEvent.HeadURL = gitEvent.ObjectAttributes.Source.WebURL

pipelines-as-code bot added fix gitlab labels Jan 21, 2026

gemini-code-assist bot reviewed Jan 21, 2026

View reviewed changes

theakshaypant force-pushed the SRVKP-10440-fix-gitlab-skip-ci branch from 17f63bd to 6ecaebd Compare January 22, 2026 03:37

zakisk reviewed Jan 22, 2026

View reviewed changes

theakshaypant force-pushed the SRVKP-10440-fix-gitlab-skip-ci branch from 6ecaebd to 5a7a9b7 Compare January 27, 2026 05:38

zakisk approved these changes Jan 30, 2026

View reviewed changes

zakisk merged commit 740ff2d into tektoncd:main Jan 30, 2026
15 of 17 checks passed

theakshaypant deleted the SRVKP-10440-fix-gitlab-skip-ci branch January 30, 2026 07:50

	processedEvent.SHAMessage = gitEvent.ObjectAttributes.LastCommit.Title
	processedEvent.SHAMessage = gitEvent.ObjectAttributes.LastCommit.Message

-		processedEvent.SHAMessage = gitEvent.ObjectAttributes.LastCommit.Title
+  // Use the full commit message (not only the subject/title) so directives like `[skip ci]`
+  // present in the commit body can be detected reliably.
+  processedEvent.SHAMessage = strings.TrimSpace(gitEvent.ObjectAttributes.LastCommit.Message)
+  if processedEvent.SHAMessage == "" {
+  	processedEvent.SHAMessage = gitEvent.ObjectAttributes.LastCommit.Title
+  }

	if (s.event.EventType == "pull_request" \|\| s.event.EventType == "Merge Request") && repo != nil {
	if (s.event.EventType == "pull_request" \|\| s.event.EventType == "Merge_Request") && repo != nil {

Conversation

theakshaypant commented Jan 21, 2026

📝 Description of the Change

👨🏻‍ Linked Jira

🔗 Linked GitHub Issue

🚀 Type of Change

🧪 Testing Strategy

🤖 AI Assistance

✅ Submitter Checklist

Uh oh!

gemini-code-assist bot commented Jan 21, 2026

Summary of Changes

Highlights

Footnotes

Uh oh!

pipelines-as-code bot commented Jan 21, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

🔍 PR Lint Feedback

⚠️ Items that need attention:

🤖 AI attribution

ℹ️ Next Steps

Uh oh!

gemini-code-assist bot left a comment

Choose a reason for hiding this comment

Code Review

Uh oh!

gemini-code-assist bot Jan 21, 2026

Choose a reason for hiding this comment

Uh oh!

chmouel Jan 21, 2026

Choose a reason for hiding this comment

Uh oh!

chmouel Jan 21, 2026

Choose a reason for hiding this comment

Uh oh!

qodo-code-review bot Jan 21, 2026

Choose a reason for hiding this comment

Ask❓

Answer:

Uh oh!

qodo-code-review bot Jan 21, 2026

Choose a reason for hiding this comment

Code Implementation 🛠️

Uh oh!

theakshaypant Jan 22, 2026

Choose a reason for hiding this comment

Uh oh!

theakshaypant commented Jan 22, 2026

Uh oh!

zakisk Jan 22, 2026

Choose a reason for hiding this comment

Uh oh!

theakshaypant Jan 22, 2026

Choose a reason for hiding this comment

Uh oh!

zakisk Jan 22, 2026

Choose a reason for hiding this comment

Uh oh!

theakshaypant Jan 22, 2026

Choose a reason for hiding this comment

Uh oh!

theakshaypant commented Jan 27, 2026

Uh oh!

qodo-code-review bot commented Jan 27, 2026

PR Reviewer Guide 🔍

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

pipelines-as-code bot commented Jan 21, 2026 •

edited

Loading