Skip to content

feat: merge-train/spartan - #24972

Merged
AztecBot merged 1 commit into
nextfrom
merge-train/spartan
Jul 25, 2026
Merged

feat: merge-train/spartan#24972
AztecBot merged 1 commit into
nextfrom
merge-train/spartan

Conversation

@AztecBot

@AztecBot AztecBot commented Jul 24, 2026

Copy link
Copy Markdown
Collaborator

BEGIN_COMMIT_OVERRIDE
chore(ci): route spartan/spartan-v5 merge-train notifications to #team-alpha-ci (#24963)
END_COMMIT_OVERRIDE

…m-alpha-ci (#24963)

## What

Two related changes for the spartan / spartan-v5 merge-train Slack
notifications:

1. **Route them to `#team-alpha-ci`** instead of `#team-alpha`, so the
team channel stops receiving CI noise.
2. **Stop silently dropping failed Slack posts** in `ci3/slack_notify`,
so a mis-delivered notification (e.g. the bot isn't a member of the
target channel) is visible in the CI log instead of vanishing.

## (1) Notification sites re-routed

| File | Notification | Before → After |
|---|---|---|
| `ci3/merge_train_failure_slack_notify` | "PR merged into …", CI
failure, and dequeue notifications for spartan / spartan-v5 (each also
kicks off a ClaudeBox investigation) | `#team-alpha` → `#team-alpha-ci`
|
| `.github/workflows/merge-train-stale-check.yml` | daily
"`merge-train/spartan…` has not merged into `next`/`v5-next`" stale
alert | `#team-alpha` → `#team-alpha-ci` |
| `.github/workflows/network-healthcheck.yml` | "Starting network
healthcheck …" kickoff + the ClaudeBox `respond_to_user` summary |
`#team-alpha` → `#team-alpha-ci` |
| `scripts/socket-fix-ci.sh` | Socket dependency-vulnerability fix
notification | `#team-alpha` → `#team-alpha-ci` |
| `ci3/merge_train_stale_check` | usage-example comment only | updated
for consistency |

`ci3/run_test_cmd` — flake notifications for spartan / spartan-v5
**already** post to `#team-alpha-ci` (since
[#23219](#23219),
2026-05-12).

## (2) Surface Slack post failures (`ci3/slack_notify`)

Previously the `chat.postMessage` curl ended in `&>/dev/null`, so any
failure — most commonly `not_in_channel` when the bot isn't a member of
the target channel — disappeared with no trace. This is the likely
reason flake notifications to `#team-alpha-ci` were never observed
despite the routing being correct: the posts were failing silently. The
script now captures the API response and logs a clear error to stderr
(`slack_notify: failed to post to Slack channel '<chan>': <error>`) on
any non-`ok` response or curl/network failure. It stays best-effort —
the failure is logged, the caller is not failed.

## Base & backport

Based on **`merge-train/spartan`** (targets `next`), and labeled
**`backport-to-v5-next`** so the same change is carried over to the
`v5-next` line. The `network-healthcheck` and `merge-train-stale-check`
schedules ultimately run from the default branch once this reaches
`next` via the train; the per-train CI scripts
(`merge_train_failure_slack_notify`, `slack_notify`, `socket-fix-ci.sh`)
run from the checked-out train head.

## Left untouched (intentionally)

- `.claude/skills/merge-trains/SKILL.md` team-mapping table,
`ci3/dashboard/.../ci-health-report.html`, `spartan/testnet-runbook.md`
— these reference the owning **team** (`#team-alpha`) or are a manual
human runbook step, not automated CI notifications.
- Other merge-train channel mappings (`#team-bonobos`, `#honk-team`,
`#help-ci`, `#dev-rels`, `#team-fairies`) are unrelated and unchanged.

## Notes

- No new Slack scopes are required — every call uses the same
`SLACK_BOT_TOKEN` + `chat.postMessage`. The bot must be a **member of
`#team-alpha-ci`** for delivery; once (2) lands, a missing membership
shows up as a `not_in_channel` line in the CI log. The **ClaudeBox app**
must also be a member so the healthcheck summary and failure/dequeue
kickoff replies can post.

---
*Created by
[claudebox](https://claudebox.work/v2/sessions/e345f34e9b2da947/jobs/1)
· group: `slackbot` · requested by Santiago Palladino · [Slack
thread](https://aztecprotocol.slack.com/archives/C0AU8BULZHC/p1784902660161109?thread_ts=1784902660.161109&cid=C0AU8BULZHC)*

@ludamad ludamad left a comment

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

🤖 Auto-approved

@AztecBot
AztecBot added this pull request to the merge queue Jul 24, 2026
@AztecBot

Copy link
Copy Markdown
Collaborator Author

🤖 Auto-merge enabled after 4 hours of inactivity. This PR will be merged automatically once all checks pass.

Merged via the queue into next with commit 0e7787a Jul 25, 2026
43 of 47 checks passed
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.

2 participants