Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions .agents/skills/buildkite-get-results/SKILL.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,3 +8,9 @@ Pass the PR number, Build URL, or Build ID to the `scripts/get_buildkite_results
The `--jobs` flag can do glob-style filtering of jobs.

The `--download` flag will download job logs.

For quick checks with the `bk` CLI, `bk job log <job_id> --no-timestamps`
prints a job's log (it doesn't take `--build`). The output keeps a stray
`ESC _` prefix, cursor and color codes, and carriage returns; strip them
before grepping:
`sed 's/\x1b\[[0-9;]*[A-Za-z]//g; s/\x1b_//g; s/\r//g'`.
15 changes: 12 additions & 3 deletions .agents/skills/merge-pr/SKILL.md
Original file line number Diff line number Diff line change
Expand Up @@ -31,9 +31,9 @@ this PR", or monitor its merge):
transient network flakes (e.g., HTTP 504 gateway timeouts, downloader
errors, `setup-bazel` `Unable to find Bazelisk version` errors) and
unblock manual approval steps.
- **Blocked Builds (`.bazelci/presubmit.yml` Approval)**: When
`.bazelci/presubmit.yml` is modified, Buildkite blocks the build until
manually approved. Approve and unblock it immediately via
- **Blocked Builds (CI Config Approval)**: When the PR changes a file under
`.bazelci/` or a `.yml` file outside `.github/`, Buildkite blocks the
build until manually approved. Approve and unblock it immediately via
`./.agents/skills/retry-ci-job/scripts/retry_ci_jobs.py
--pr <pr_number> --unblock` (or `bk job unblock <job_id> --no-input`) so CI
does not sit blocked indefinitely.
Expand All @@ -44,6 +44,15 @@ this PR", or monitor its merge):
`'.[].name | select(test("gh-readonly-queue/.*/pr-<pr_number>-"))'`
and monitor commit statuses/Buildkite builds running on that temporary
branch.
- **Blocked Merge Queue Builds**: If the PR changes a file under
`.bazelci/` or a `.yml` file outside `.github/`, the merge queue build
is blocked again, even with the `presubmit-auto-run` label, and
`monitor_remote_ci.py` doesn't watch it. Find it with `bk build list
--pipeline bazel/rules-python-python --branch <queue_branch> --json |
jq '.[] | {number, state, blocked}'`, then unblock it with
`./.agents/skills/retry-ci-job/scripts/retry_ci_jobs.py
--buildkite-build bazel/rules-python-python/<build_number> --unblock`.
`--pr <pr_number>` resolves to the PR's build, not the queue build.
4. **Queue Shepherding**: Periodically check
`gh pr view <pr_number> --repo bazel-contrib/rules_python --json
state,autoMergeRequest,mergeStateStatus,mergeable`. While `state` is
Expand Down
7 changes: 6 additions & 1 deletion .agents/skills/monitor-ci-results/SKILL.md
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,12 @@ or when monitoring CI after PR updates:
3. **Failure Reporting**: When any GitHub check or Buildkite job completes
with errors, `monitor_remote_ci.py` dispatches a high-priority notification
message reporting the failed check back to your conversation.
- Soft failures (e.g. `*rolling*` Bazel) are non-blocking warnings; ignore.
- Soft failures (e.g. `*rolling*` Bazel) don't block merging, but the
monitor counts them as passed. Before reporting that everything
passed, list them with `bk build view <build_number> --pipeline
bazel/rules-python-python --json | jq '.jobs[] | select(.soft_failed)
| {id, name}'` and compare their failing tests with the latest `main`
build's.
- If `blocks-do-not-merge` fails while the PR intentionally carries the
`"do not merge"` label, treat it as an expected merge gate rather than a
code failure.
Expand Down
Loading