Skip to content

Conversation

@darccio
Copy link
Member

@darccio darccio commented Aug 18, 2025

What does this PR do?

Updates workflows so main CI checks happen during a merge queue run. Specifically it marks all workflows that run in push events to main to run on those events on branches starting with mq-working-branch.

Additionally:

  • Standardises pull_request triggers to explicitly set opened, reopened, and synchronized default states.
  • Standardises tags-ignore for push triggers to ignore all nested modules' version tags.
  • Removes merge_group triggers.
  • Removes synchronized event on pull-request-title-validation.
  • Updates Go version to the highest supported one on pull-request workflow.
  • Swaps main-branch-tests with pull-requests, making sure any flakiness is early detected.
  • main-branch-tests run only high-signal unit-integration-tests with a smaller set.
  • Fixes indentation on system-tests.
  • Introduces repository caching to avoid pulling it in matrix-based tests like system-tests, pull-request, or main-branch-tests.

Motivation

Clarify CI usage and ensure that failing CI checks have visibility and impact. Currently we can only see if anything is wrong on main by looking at the CI checks for a commit in GitHub's UI.

Note 1: this PR requires a small change on repository's settings to move the required checks PR Unit and Integration Tests / test-core and PR Unit and Integration Tests / test-contrib to PR Unit and Integration Tests.

Note 2: this PR would cause that no check will run if somebody with admin privileges doesn't use the merge queue. It should be possible to avoid that by setting some kind of break glass job that must run when merging directly from the UI. Merge queue should work by skipping it.

Reviewer's Checklist

  • Changed code has unit tests for its functionality at or near 100% coverage.
  • System-Tests covering this feature have been added and enabled with the va.b.c-dev version tag.
  • There is a benchmark for any new code, or changes to existing code.
  • If this interacts with the agent in a new way, a system test has been added.
  • New code is free of linting errors. You can check this by running ./scripts/lint.sh locally.
  • Add an appropriate team label so this PR gets put in the right place for the release notes.
  • Non-trivial go.mod changes, e.g. adding new modules, are reviewed by @DataDog/dd-trace-go-guild.

Unsure? Have a question? Request a review!

@darccio darccio marked this pull request as ready for review August 18, 2025 17:44
@darccio darccio requested review from a team as code owners August 18, 2025 17:44
@datadog-datadog-prod-us1
Copy link

datadog-datadog-prod-us1 bot commented Aug 18, 2025

✅ Tests

🎉 All green!

❄️ No new flaky tests detected
🧪 All tests passed

This comment will be updated automatically if new data arrives.
🔗 Commit SHA: 957c7cf | Docs | Was this helpful? Give us feedback!

@darccio darccio force-pushed the dario.castane/ktlo/disable-main-branch-ci branch from acd62bd to b742c82 Compare August 19, 2025 08:14
@pr-commenter
Copy link

pr-commenter bot commented Aug 19, 2025

Benchmarks

Benchmark execution time: 2025-09-03 14:40:47

Comparing candidate commit 957c7cf in PR branch dario.castane/ktlo/disable-main-branch-ci with baseline commit 1921d92 in branch main.

Found 0 performance improvements and 0 performance regressions! Performance is the same for 24 metrics, 0 unstable metrics.

Copy link
Contributor

@hannahkm hannahkm left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good, thank you!

@darccio darccio force-pushed the dario.castane/ktlo/disable-main-branch-ci branch 2 times, most recently from d742705 to 849e00d Compare August 21, 2025 10:07
@darccio darccio changed the title chore(ci): move main CI checks to merge queue runs chore(.github/workflowsw): move main CI checks to merge queue runs Aug 21, 2025
@darccio darccio force-pushed the dario.castane/ktlo/disable-main-branch-ci branch from 8635ff7 to 58b7fa2 Compare August 22, 2025 10:29
Copy link
Member

@kakkoyun kakkoyun left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@darccio darccio force-pushed the dario.castane/ktlo/disable-main-branch-ci branch 3 times, most recently from f9521df to bd8a68a Compare August 28, 2025 08:49
@darccio
Copy link
Member Author

darccio commented Aug 28, 2025

/merge

@dd-devflow-routing-codex
Copy link

dd-devflow-routing-codex bot commented Aug 28, 2025

View all feedbacks in Devflow UI.

2025-08-28 09:28:50 UTC ℹ️ Start processing command /merge


2025-08-28 09:29:01 UTC ℹ️ MergeQueue: waiting for PR to be ready

This merge request is not mergeable yet, because of pending checks/missing approvals. It will be added to the queue as soon as checks pass and/or get approvals.
Note: if you pushed new commits since the last approval, you may need additional approval.
You can remove it from the waiting list with /remove command.


2025-08-28 09:47:52 UTC ⚠️ MergeQueue: This merge request was unqueued

dario.castane@datadoghq.com unqueued this merge request

runs-on: ${{ matrix.runs-on }}
ref: ${{ inputs.ref || github.ref }}
secrets: inherit
go-version: "1.25" # Should be the highest supported version of Go
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Would be neat if that supported the stable alias?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That introduces the "risk" of having red CI if a new Go release causes the pipeline to fail. I prefer to have control, in the same line of the previous point about stating explicitly configs equivalent to the defaults.

@darccio
Copy link
Member Author

darccio commented Aug 28, 2025

/merge -c

@dd-devflow-routing-codex
Copy link

dd-devflow-routing-codex bot commented Aug 28, 2025

View all feedbacks in Devflow UI.

2025-08-28 09:47:41 UTC ℹ️ Start processing command /merge -c

Comment on lines -22 to +27
inputs:
ref:
description: 'System Tests ref/tag/branch'
required: true
default: main
type: string
inputs:
ref:
description: 'System Tests ref/tag/branch'
required: true
default: main
type: string
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is it just me or I think this part in indented differently ?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It had extra indentation, that's why it was modified.

@darccio darccio force-pushed the dario.castane/ktlo/disable-main-branch-ci branch from ba0972d to 957c7cf Compare September 3, 2025 14:27
@darccio
Copy link
Member Author

darccio commented Sep 4, 2025

/merge

@dd-devflow-routing-codex
Copy link

dd-devflow-routing-codex bot commented Sep 4, 2025

View all feedbacks in Devflow UI.

2025-09-04 06:37:07 UTC ℹ️ Start processing command /merge


2025-09-04 06:37:12 UTC ℹ️ MergeQueue: pull request added to the queue

The expected merge time in main is approximately 14m (p90).


2025-09-04 06:51:00 UTC ℹ️ MergeQueue: This merge request was merged

@dd-mergequeue dd-mergequeue bot merged commit d6a972f into main Sep 4, 2025
263 checks passed
@dd-mergequeue dd-mergequeue bot deleted the dario.castane/ktlo/disable-main-branch-ci branch September 4, 2025 06:50
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants