Skip to content

[v3-2-test] Adopt apache/airflow-steward framework#67420

Merged
potiuk merged 1 commit into
apache:v3-2-testfrom
potiuk:adopt-apache-steward-v3-2-test
May 24, 2026
Merged

[v3-2-test] Adopt apache/airflow-steward framework#67420
potiuk merged 1 commit into
apache:v3-2-testfrom
potiuk:adopt-apache-steward-v3-2-test

Conversation

@potiuk

@potiuk potiuk commented May 24, 2026

Copy link
Copy Markdown
Member

Backports the framework adoption from main (#66677 + #67149) onto v3-2-test, plus the latest framework bootstrap refresh (apache/magpie#247 — Pattern D single-directory-symlink layout).

Why

Future agentic improvements to triage / code-review / stats land as overrides under `.apache-steward-overrides/` on main and need a place to live on v3-2-test too. Without this PR, a backport like #67322 (drop failing job names from triage comments) has to edit a different file path on each branch — fragile and easy to forget. With this PR, every such backport is a clean cherry-pick.

What changes

  • Removes the self-hosted `pr-triage` skill at `.github/skills/pr-triage/` (and its symlink `.claude/skills/pr-triage`). Functionality moves into the apache-steward framework as `pr-management-triage`, fetched on demand via the snapshot mechanism.
  • Wires up the apache-steward adoption: committed `setup-steward` bootstrap at `.github/skills/setup-steward/`, `.claude/skills/setup-steward` symlink, `.apache-steward.lock` pinned to framework `main`, and `.apache-steward-overrides/{README,user,pr-management-config,pr-management-triage-ci-check-map,pr-management-triage-comment-templates}.md`.
  • Refreshes the `setup-steward` bootstrap to the latest framework main (setup-steward: support single directory-symlink layout (Pattern D) magpie#247) so adopters of the new framework benefit from the consolidated install flow.
  • Rewrites `contributing-docs/25_maintainer_pr_triage.md` to point at the framework skill URLs.
  • Adds the apache-steward section to `AGENTS.md` and the "Agent-assisted contribution" section to `README.md`.
  • Updates `.gitignore` to allow-list `setup-steward` and exclude the symlink families under both `.claude/skills/` and `.github/skills/`.
  • Updates `.pre-commit-config.yaml` to skip `.apache-steward-overrides/` and `.github/skills/setup-steward/` in codespell and markdownlint.

What does not change

  • `maintainer-review` and `pr-stats` were never backported to v3-2-test, so there's nothing to remove for them; they'll simply show up as `pr-management-code-review` / `pr-management-stats` after a fresh `/setup-steward`.
  • The `lychee` prek hook does not exist on v3-2-test, so its exclude hunk from main's adoption commit is N/A here.

After merge

Contributors run `/setup-steward` in their agent harness to populate the gitignored `.apache-steward/` snapshot and make every `pr-management-*` skill invocable. See the new README section "Agent-assisted contribution (apache-steward)" for the setup flow.


Was generative AI tooling used to co-author this PR?
  • Yes — Claude Code (Opus 4.7)

Generated-by: Claude Code (Opus 4.7) following the guidelines

Backports the framework adoption from main (apache#66677 + apache#67149) so that
v3-2-test gets the same agent-driven PR-management skills that main
already uses, and so that future agentic fixes that ship as overrides
under \`.apache-steward-overrides/\` cherry-pick cleanly to v3-2-test
instead of hitting structural conflicts against the old self-hosted
\`pr-triage\` skill.

What changes:

- Remove the self-hosted \`pr-triage\` skill at \`.github/skills/pr-triage/\`
  (and its symlink \`.claude/skills/pr-triage\`). Its functionality
  moves into the apache-steward framework as \`pr-management-triage\`,
  fetched on demand via the snapshot mechanism.
- Wire up the apache-steward adoption: committed \`setup-steward\`
  bootstrap at \`.github/skills/setup-steward/\` (with a sibling
  \`.claude/skills/setup-steward\` symlink), \`.apache-steward.lock\`
  pinned to framework \`main\`, and the \`.apache-steward-overrides/\`
  directory with the three pr-management-triage config files
  (\`pr-management-config.md\`, \`pr-management-triage-ci-check-map.md\`,
  \`pr-management-triage-comment-templates.md\`) plus README and user.md.
- Refresh the \`setup-steward\` bootstrap to the latest framework main
  (apache/magpie#247 — Pattern D single-directory-symlink
  layout) so adopters of the new framework benefit from the consolidated
  install flow.
- Rewrite \`contributing-docs/25_maintainer_pr_triage.md\` to point at
  the framework skill URLs (\`apache/airflow-steward/.../pr-management-*\`)
  rather than the now-removed local skill paths.
- Add the apache-steward section to \`AGENTS.md\` and the
  "Agent-assisted contribution" section to \`README.md\`.
- Update \`.gitignore\` to allow-list \`setup-steward\` and to exclude
  the symlink families (\`security-*\`, \`pr-management-*\`, \`issue-*\`,
  \`setup-isolated-setup-*\`, \`setup-override-upstream\`,
  \`setup-shared-config-sync\`, \`list-steward-*\`) under both
  \`.claude/skills/\` and \`.github/skills/\`.
- Update \`.pre-commit-config.yaml\` to skip \`.apache-steward-overrides/\`
  and \`.github/skills/setup-steward/\` in codespell and markdownlint
  (the framework prose uses hyphenated forms codespell flags as
  misspellings, and the snapshot-internal links break markdownlint).

What does not change:

- \`maintainer-review\` and \`pr-stats\` skills were never backported to
  v3-2-test, so there's nothing to remove for them — they will simply
  show up as \`pr-management-code-review\` and \`pr-management-stats\`
  after a fresh \`/setup-steward\`.
- The \`lychee\` prek hook does not exist on v3-2-test, so its exclude
  hunk from main's adoption commit is N/A here.

After this lands, contributors run \`/setup-steward\` in their agent
harness to populate the gitignored \`.apache-steward/\` snapshot and
make every \`pr-management-*\` skill invocable. See the README section
"Agent-assisted contribution (apache-steward)" for the setup flow.
@potiuk potiuk requested a review from kaxil as a code owner May 24, 2026 15:30
@potiuk potiuk added this to the Airflow 3.2.2 milestone May 24, 2026
@potiuk potiuk merged commit fcf5c32 into apache:v3-2-test May 24, 2026
35 checks passed
@potiuk potiuk deleted the adopt-apache-steward-v3-2-test branch May 24, 2026 15:36
vatsrahul1001 pushed a commit that referenced this pull request May 25, 2026
Backports the framework adoption from main (#66677 + #67149) so that
v3-2-test gets the same agent-driven PR-management skills that main
already uses, and so that future agentic fixes that ship as overrides
under \`.apache-steward-overrides/\` cherry-pick cleanly to v3-2-test
instead of hitting structural conflicts against the old self-hosted
\`pr-triage\` skill.

What changes:

- Remove the self-hosted \`pr-triage\` skill at \`.github/skills/pr-triage/\`
  (and its symlink \`.claude/skills/pr-triage\`). Its functionality
  moves into the apache-steward framework as \`pr-management-triage\`,
  fetched on demand via the snapshot mechanism.
- Wire up the apache-steward adoption: committed \`setup-steward\`
  bootstrap at \`.github/skills/setup-steward/\` (with a sibling
  \`.claude/skills/setup-steward\` symlink), \`.apache-steward.lock\`
  pinned to framework \`main\`, and the \`.apache-steward-overrides/\`
  directory with the three pr-management-triage config files
  (\`pr-management-config.md\`, \`pr-management-triage-ci-check-map.md\`,
  \`pr-management-triage-comment-templates.md\`) plus README and user.md.
- Refresh the \`setup-steward\` bootstrap to the latest framework main
  (apache/magpie#247 — Pattern D single-directory-symlink
  layout) so adopters of the new framework benefit from the consolidated
  install flow.
- Rewrite \`contributing-docs/25_maintainer_pr_triage.md\` to point at
  the framework skill URLs (\`apache/airflow-steward/.../pr-management-*\`)
  rather than the now-removed local skill paths.
- Add the apache-steward section to \`AGENTS.md\` and the
  "Agent-assisted contribution" section to \`README.md\`.
- Update \`.gitignore\` to allow-list \`setup-steward\` and to exclude
  the symlink families (\`security-*\`, \`pr-management-*\`, \`issue-*\`,
  \`setup-isolated-setup-*\`, \`setup-override-upstream\`,
  \`setup-shared-config-sync\`, \`list-steward-*\`) under both
  \`.claude/skills/\` and \`.github/skills/\`.
- Update \`.pre-commit-config.yaml\` to skip \`.apache-steward-overrides/\`
  and \`.github/skills/setup-steward/\` in codespell and markdownlint
  (the framework prose uses hyphenated forms codespell flags as
  misspellings, and the snapshot-internal links break markdownlint).

What does not change:

- \`maintainer-review\` and \`pr-stats\` skills were never backported to
  v3-2-test, so there's nothing to remove for them — they will simply
  show up as \`pr-management-code-review\` and \`pr-management-stats\`
  after a fresh \`/setup-steward\`.
- The \`lychee\` prek hook does not exist on v3-2-test, so its exclude
  hunk from main's adoption commit is N/A here.

After this lands, contributors run \`/setup-steward\` in their agent
harness to populate the gitignored \`.apache-steward/\` snapshot and
make every \`pr-management-*\` skill invocable. See the README section
"Agent-assisted contribution (apache-steward)" for the setup flow.
vatsrahul1001 pushed a commit that referenced this pull request May 25, 2026
Backports the framework adoption from main (#66677 + #67149) so that
v3-2-test gets the same agent-driven PR-management skills that main
already uses, and so that future agentic fixes that ship as overrides
under \`.apache-steward-overrides/\` cherry-pick cleanly to v3-2-test
instead of hitting structural conflicts against the old self-hosted
\`pr-triage\` skill.

What changes:

- Remove the self-hosted \`pr-triage\` skill at \`.github/skills/pr-triage/\`
  (and its symlink \`.claude/skills/pr-triage\`). Its functionality
  moves into the apache-steward framework as \`pr-management-triage\`,
  fetched on demand via the snapshot mechanism.
- Wire up the apache-steward adoption: committed \`setup-steward\`
  bootstrap at \`.github/skills/setup-steward/\` (with a sibling
  \`.claude/skills/setup-steward\` symlink), \`.apache-steward.lock\`
  pinned to framework \`main\`, and the \`.apache-steward-overrides/\`
  directory with the three pr-management-triage config files
  (\`pr-management-config.md\`, \`pr-management-triage-ci-check-map.md\`,
  \`pr-management-triage-comment-templates.md\`) plus README and user.md.
- Refresh the \`setup-steward\` bootstrap to the latest framework main
  (apache/magpie#247 — Pattern D single-directory-symlink
  layout) so adopters of the new framework benefit from the consolidated
  install flow.
- Rewrite \`contributing-docs/25_maintainer_pr_triage.md\` to point at
  the framework skill URLs (\`apache/airflow-steward/.../pr-management-*\`)
  rather than the now-removed local skill paths.
- Add the apache-steward section to \`AGENTS.md\` and the
  "Agent-assisted contribution" section to \`README.md\`.
- Update \`.gitignore\` to allow-list \`setup-steward\` and to exclude
  the symlink families (\`security-*\`, \`pr-management-*\`, \`issue-*\`,
  \`setup-isolated-setup-*\`, \`setup-override-upstream\`,
  \`setup-shared-config-sync\`, \`list-steward-*\`) under both
  \`.claude/skills/\` and \`.github/skills/\`.
- Update \`.pre-commit-config.yaml\` to skip \`.apache-steward-overrides/\`
  and \`.github/skills/setup-steward/\` in codespell and markdownlint
  (the framework prose uses hyphenated forms codespell flags as
  misspellings, and the snapshot-internal links break markdownlint).

What does not change:

- \`maintainer-review\` and \`pr-stats\` skills were never backported to
  v3-2-test, so there's nothing to remove for them — they will simply
  show up as \`pr-management-code-review\` and \`pr-management-stats\`
  after a fresh \`/setup-steward\`.
- The \`lychee\` prek hook does not exist on v3-2-test, so its exclude
  hunk from main's adoption commit is N/A here.

After this lands, contributors run \`/setup-steward\` in their agent
harness to populate the gitignored \`.apache-steward/\` snapshot and
make every \`pr-management-*\` skill invocable. See the README section
"Agent-assisted contribution (apache-steward)" for the setup flow.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant