Repository navigation
[chore](ci) Require TeamCity/external on master, branch-4.2 and branch-4.1 - #70578
Merged
hello-stephen merged 1 commit intoNov 14, 2026
Merged
Conversation
…h-4.1 ### Background The required status checks of every protected branch come from `protected_branches` in the `.asf.yaml` on `master`. ASF's asfyaml service applies that section to GitHub whenever the `github:` block changes; the copies on release branches have no effect. Since apache#70459, PRs into `master`, `branch-4.2` and `branch-4.1` are checked by the new TeamCity, which reports statuses named `TeamCity/<pipeline>`. External is the regression lane for external catalogs and their docker fixtures. ### What problem does this PR solve? Issue Number: None Related PR: apache#70459 (introduced the behavior this PR changes), apache#70457 (must be picked to branch-4.2 and branch-4.1 first) PR Type: Build/CI/Chore Problem Summary: When apache#70459 renamed the required checks, it left `TeamCity/external` out, so a red External run no longer blocks merges into `master`, `branch-4.2` or `branch-4.1`. This PR adds it back to all three lists, in the slot the old `External Regression (Doris External Regression)` check had. Merging also makes asfyaml re-apply the whole section, and GitHub is out of sync with it today: `branch-4.2` still requires the nine pre-migration names, which new PRs never receive, and `branch-4.1` and `branch-2.0` have no protection at all. ### Details - **Affected:** GitHub branch protection only: one more required context on `master` (17 in total), `branch-4.2` (13) and `branch-4.1` (13). No workflow, script or TeamCity change: External uses P0's file filter, so a PR that skips P0 also gets a skipped `TeamCity/external`. Trailing spaces are dropped from two `branch-4.0` and `branch-3.1` lines, which changes no value. - **Developer and release impact:** PRs into the three branches need `TeamCity/external` green or skipped before they can merge. On `branch-4.2` and `branch-4.1` its preflight fails today with `Native rootless support missing; cherry-pick PR70457 before validating this branch`, so apache#70457 has to be picked to both branches before this lands, or every 4.x PR that runs External is blocked. Once protection is re-applied, `branch-4.1` PRs again need an approval and green required checks, and `branch-4.2` PRs can merge on the `TeamCity/*` checks they actually receive. - **License and third-party:** None. - **Rollback:** Revert this commit; asfyaml applies the previous lists again because the `github:` block changes. ### Testing - `asfyaml-validate` from apache/infrastructure-asfyaml (`e4c2644`), run locally: the old and the new file are valid, and copies with a non-integer review count or a mis-indented list item are rejected. - Both files parsed locally with asfyaml's GitHub schema: the only data change is `TeamCity/external` in the three `contexts` lists, with the existing order kept and no duplicates. - Every name in the new lists is reported on live PRs: all 17 on apache#70366 (`master`), and all 13 on a recent `branch-4.1` PR. ### Notes for Reviewers - asfyaml runs only on `master`, after the merge, so whether GitHub takes the new lists can only be checked then: `gh api repos/apache/doris/branches/<branch> --jq .protection.required_status_checks.contexts` for each branch, and `.protected` for `branch-4.1` and `branch-2.0`. A failed run is mailed to [email protected] and to whoever merged. - `TeamCity/performance` stays optional; the comment above the lists now says only that. ### Release note None ### Check List (For Author) - Behavior changed: No - Does this need documentation: No - Pre-submission status: Partially verified: the file passes ASF's validator, but whether asfyaml applies it to GitHub can only be checked after the merge. ### AI Disclosure - Tool: Claude Code (Claude Opus 5.5) - Generated: the `.asf.yaml` change and this description - Human review: not stated - Prompts: Asked why `TeamCity/external` is not a required check on apache#70366, then to make it required again and fix the out-of-sync protection of `branch-4.1` and `branch-4.2`, changing only `.asf.yaml` and listing any 4.x cherry-picks for the author to handle. Co-Authored-By: Claude Opus 5.5 <[email protected]>
hello-stephen
approved these changes
Nov 14, 2026
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Background
The required status checks of every protected branch come from
protected_branchesin the.asf.yamlonmaster. ASF's asfyaml service applies that section to GitHub whenever thegithub:block changes; the copies on release branches have no effect. Since #70459, PRs intomaster,branch-4.2andbranch-4.1are checked by the new TeamCity, which reports statuses namedTeamCity/<pipeline>. External is the regression lane for external catalogs and their docker fixtures.What problem does this PR solve?
Issue Number: None
Related PR: #70459 (introduced the behavior this PR changes), #70457 (must be picked to branch-4.2 and branch-4.1 first)
PR Type: Build/CI/Chore
Problem Summary:
When #70459 renamed the required checks, it left
TeamCity/externalout, so a red External run no longer blocks merges intomaster,branch-4.2orbranch-4.1. This PR adds it back to all three lists, in the slot the oldExternal Regression (Doris External Regression)check had. Merging also makes asfyaml re-apply the whole section, and GitHub is out of sync with it today:branch-4.2still requires the nine pre-migration names, which new PRs never receive, andbranch-4.1andbranch-2.0have no protection at all.Details
master(17 in total),branch-4.2(13) andbranch-4.1(13). No workflow, script or TeamCity change: External uses P0's file filter, so a PR that skips P0 also gets a skippedTeamCity/external. Trailing spaces are dropped from twobranch-4.0andbranch-3.1lines, which changes no value.TeamCity/externalgreen or skipped before they can merge. Onbranch-4.2andbranch-4.1its preflight fails today withNative rootless support missing; cherry-pick PR70457 before validating this branch, so [chore](docker)Support rootless Docker for third-party environments #70457 has to be picked to both branches before this lands, or every 4.x PR that runs External is blocked. Once protection is re-applied,branch-4.1PRs again need an approval and green required checks, andbranch-4.2PRs can merge on theTeamCity/*checks they actually receive.github:block changes.Testing
asfyaml-validatefrom apache/infrastructure-asfyaml (e4c2644), run locally: the old and the new file are valid, and copies with a non-integer review count or a mis-indented list item are rejected.TeamCity/externalin the threecontextslists, with the existing order kept and no duplicates.master), and all 13 on a recentbranch-4.1PR.Notes for Reviewers
master, after the merge, so whether GitHub takes the new lists can only be checked then:gh api repos/apache/doris/branches/<branch> --jq .protection.required_status_checks.contextsfor each branch, and.protectedforbranch-4.1andbranch-2.0. A failed run is mailed to [email protected] and to whoever merged.TeamCity/performancestays optional; the comment above the lists now says only that.Release note
None
Check List (For Author)
AI Disclosure
.asf.yamlchange and this descriptionTeamCity/externalis not a required check on [fix](nereids) Fix SQL masking and view rewrites after supplementary characters #70366, then to make it required again and fix the out-of-sync protection ofbranch-4.1andbranch-4.2, changing only.asf.yamland listing any 4.x cherry-picks for the author to handle.