Skip to content

fix(ci): name the merge-train branch in Slack notifications - #24102

Merged
alexghr merged 1 commit into
nextfrom
cb/95d94fda4cc1
Jun 15, 2026
Merged

fix(ci): name the merge-train branch in Slack notifications#24102
alexghr merged 1 commit into
nextfrom
cb/95d94fda4cc1

Conversation

@AztecBot

Copy link
Copy Markdown
Collaborator

What

The merge-train Slack notifications said There was a failure in the merge-train with no indication of which train. Now that several teams own multiple merge-trains that report to the same channel (e.g. #team-alpha receives both merge-train/spartan and merge-train/spartan-v5, #team-fairies gets merge-train/fairies and merge-train/fairies-v5), the messages were ambiguous.

This includes the merge-train branch name ($REF_NAME) in all three notification messages in ci3/merge_train_failure_slack_notify:

  • Failure: There was a failure in merge-train/spartan: http://ci.aztec-labs.com/...
  • Dequeued: PR was removed from the merge-train/spartan merge queue: ...
  • Merged: PR merged into merge-train/spartan: ...

The claudebox kickoff prompts already named $REF_NAME; only the human-facing Slack text was missing it.

Why

Requested in #team-alpha: notifications should specify which merge-train they refer to since there are now multiple merge-trains per team.


Created by claudebox · group: slackbot

@AztecBot AztecBot added ci-draft Run CI on draft PRs. ci-no-fail-fast Sets NO_FAIL_FAST in the CI so the run is not aborted on the first failure claudebox Owned by claudebox. it can push to this PR. labels Jun 15, 2026
@alexghr
alexghr marked this pull request as ready for review June 15, 2026 19:15
@alexghr
alexghr requested a review from charlielye as a code owner June 15, 2026 19:15
@alexghr
alexghr added this pull request to the merge queue Jun 15, 2026
@AztecBot

Copy link
Copy Markdown
Collaborator Author

Flakey Tests

🤖 says: This CI run detected 1 tests that failed, but were tolerated due to a .test_patterns.yml entry.

\033FLAKED\033 (8;;http://ci.aztec-labs.com/0dfabd5c4e266096�0dfabd5c4e2660968;;�):  yarn-project/end-to-end/scripts/run_test.sh simple src/e2e_p2p/rediscovery.test.ts (119s) (code: 0) group:e2e-p2p-epoch-flakes

Merged via the queue into next with commit 872362d Jun 15, 2026
52 of 60 checks passed
@alexghr
alexghr deleted the cb/95d94fda4cc1 branch June 15, 2026 19:59
AztecBot pushed a commit that referenced this pull request Jun 16, 2026
## What

The merge-train Slack notifications said `There was a failure in the
merge-train` with no indication of *which* train. Now that several teams
own multiple merge-trains that report to the same channel (e.g.
`#team-alpha` receives both `merge-train/spartan` and
`merge-train/spartan-v5`, `#team-fairies` gets `merge-train/fairies` and
`merge-train/fairies-v5`), the messages were ambiguous.

This includes the merge-train branch name (`$REF_NAME`) in all three
notification messages in `ci3/merge_train_failure_slack_notify`:

- **Failure:** `There was a failure in merge-train/spartan:
http://ci.aztec-labs.com/...`
- **Dequeued:** `PR was removed from the merge-train/spartan merge
queue: ...`
- **Merged:** `PR merged into merge-train/spartan: ...`

The claudebox kickoff prompts already named `$REF_NAME`; only the
human-facing Slack text was missing it.

## Why

Requested in #team-alpha: notifications should specify which merge-train
they refer to since there are now multiple merge-trains per team.

---
*Created by
[claudebox](https://claudebox.work/v2/sessions/95d94fda4cc1e492) ·
group: `slackbot`*
@AztecBot

Copy link
Copy Markdown
Collaborator Author

✅ Successfully backported to backport-to-v5-next-staging #24118.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

backport-to-v5-next ci-draft Run CI on draft PRs. ci-no-fail-fast Sets NO_FAIL_FAST in the CI so the run is not aborted on the first failure claudebox Owned by claudebox. it can push to this PR.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants