[DO NOT MERGE] Upstream feb 26

.github/copy-pr-bot.yaml

@@ -1,4 +1,4 @@
 enabled: true
 auto_sync_draft: false
 auto_sync_ready: true
-trustees_override: ["AAnoosheh", "ArEsKay3", "Autumn1998", "BestJuly", "BoxiangW", "ChenhanYu", "FDecaYed", "HaochenYuan", "ISEEKYAN", "JRD971000", "Phlip79", "QiZhangNV", "ShriyaRishab", "Victarry", "Wohox", "ZhiyuLi-Nvidia", "ahmadki", "aklife97", "ananthsub", "asolergi-nv", "buptzyb", "chtruong814", "cspades", "cuichenx", "deepakn94", "dimapihtar", "duncanriach", "erhoo82", "ericharper", "fanshiqing", "frsun-nvda", "gautham-kollu", "gdengk", "guyueh1", "hxbai", "jalbericiola", "janEbert", "jaredcasper", "jenchen13", "jiemingz", "jingqiny-99", "jkamalu", "jon-barker", "jstjohn", "kanz-nv", "kevalmorabia97", "ko3n1g", "kunlunl", "kvareddy", "kwyss-nvidia", "layalir", "lhb8125", "lmcafee-nvidia", "maanug-nv", "mathemakitten", "matthieule", "mehraakash", "mkhona-nvidia", "parthmannan", "prajwal1210", "pthombre", "rogerwaleffe", "sanandaraj5597", "sancha", "santhnm2", "sbak5", "shanmugamr1992", "shifangx", "shjwudp", "sidsingh-nvidia", "skyw", "sudhakarsingh27", "tdene", "theothermike", "thomasdhc", "trintamaki", "tylerpoon", "wdykas", "xiaoyao0115", "xuwchen", "yanring", "yaox12", "yaoyu-33", "yashaswikarnati", "yeyu-nvidia", "yobibyte", "youngeunkwon0405", "yuzhongw-nvidia", "zhongbozhu"]
+trustees_override: ["AAnoosheh", "ArEsKay3", "Autumn1998", "BestJuly", "BoxiangW", "CarlosGomes98", "ChenhanYu", "FDecaYed", "HaochenYuan", "ISEEKYAN", "JRD971000", "Phlip79", "QiZhangNV", "RPrenger", "ShriyaRishab", "Victarry", "Wohox", "ZhiyuLi-Nvidia", "ahmadki", "aklife97", "ananthsub", "asolergi-nv", "buptzyb", "chtruong814", "cspades", "cuichenx", "deepakn94", "dimapihtar", "dingqingy-nv", "duncanriach", "erhoo82", "ericharper", "fanshiqing", "faradawn", "frsun-nvda", "gautham-kollu", "gdengk", "guyueh1", "hxbai", "ilml", "jalbericiola", "janEbert", "jaredcasper", "jenchen13", "jiemingz", "jingqiny-99", "jkamalu", "jon-barker", "jstjohn", "kanz-nv", "kevalmorabia97", "ko3n1g", "kunlunl", "kvareddy", "kwyss-nvidia", "layalir", "lhb8125", "lmcafee-nvidia", "maanug-nv", "mathemakitten", "matthieule", "mchrzanowski", "mehraakash", "mkhona-nvidia", "parthmannan", "prajwal1210", "pthombre", "rogerwaleffe", "sajadn", "sanandaraj5597", "sancha", "santhnm2", "sbak5", "shanmugamr1992", "sharathts", "shengf-nv", "shifangx", "shjwudp", "sidsingh-nvidia", "skyw", "sudhakarsingh27", "tdene", "theothermike", "thomasdhc", "trintamaki", "tylerpoon", "wdykas", "xiaoyao0115", "xuwchen", "yanring", "yaox12", "yaoyu-33", "yashaswikarnati", "yeyu-nvidia", "yobibyte", "youngeunkwon0405", "yueshen2016", "yuzhongw-nvidia", "zhongbozhu"]

.github/oncall_schedule.json

@@ -1,18 +1,6 @@
 [
-    {
-        "user": "dimapihtar",
-        "date": "2026-01-28"
-    },
-    {
-        "user": "gautham-kollu",
-        "date": "2026-02-04"
-    },
     {
         "user": "janEbert",
-        "date": "2026-02-11"
-    },
-    {
-        "user": "Phlip79",
         "date": "2026-02-18"
     },
     {
@@ -46,5 +34,17 @@
     {
         "user": "BoxiangW",
         "date": "2026-04-15"
+    },
+    {
+        "user": "Phlip79",
+        "date": "2026-04-22"
+    },
+    {
+        "user": "asolergi-nv",
+        "date": "2026-04-29"
+    },
+    {
+        "user": "dimapihtar",
+        "date": "2026-05-06"
     }
 ]

.github/scripts/readme.sh

@@ -0,0 +1,65 @@
+#!/bin/bash
+
+cat << 'EOF'
+╔══════════════════════════════════════════════════════════════════════╗
+║                                                                      ║
+║    ███╗   ███╗██████╗ ██████╗ ██╗██████╗  ██████╗ ███████╗         ║
+║    ████╗ ████║██╔══██╗██╔══██╗██║██╔══██╗██╔════╝ ██╔════╝         ║
+║    ██╔████╔██║██████╔╝██████╔╝██║██║  ██║██║  ███╗█████╗           ║
+║    ██║╚██╔╝██║██╔══██╗██╔══██╗██║██║  ██║██║   ██║██╔══╝           ║
+║    ██║ ╚═╝ ██║██████╔╝██║  ██║██║██████╔╝╚██████╔╝███████╗         ║
+║    ╚═╝     ╚═╝╚═════╝ ╚═╝  ╚═╝╚═╝╚═════╝  ╚═════╝ ╚══════╝         ║
+║                                                                      ║
+║              H O W   T O :   M B R I D G E   T E S T I N G         ║
+╚══════════════════════════════════════════════════════════════════════╝
+
+  MBridge unit tests run automatically on every PR. To also trigger
+  functional tests, attach the label and re-run the workflow step.
+
+  ┌─────────────────────────────────────────────────────────────────┐
+  │  DEFAULT  │  Unit tests run on every PR (no action needed)      │
+  ├─────────────────────────────────────────────────────────────────┤
+  │                                                                  │
+  │    Every PR  ──►  cicd-mbridge-testing  ──►  unit tests only   │
+  │                                                                  │
+  └─────────────────────────────────────────────────────────────────┘
+
+  ┌─────────────────────────────────────────────────────────────────┐
+  │  STEP 1  │  Attach the label to your PR (for functional tests)  │
+  ├─────────────────────────────────────────────────────────────────┤
+  │                                                                  │
+  │    PR Labels  ──►  [ + Add label ]  ──►  "Run MBridge tests"   │
+  │                                                                  │
+  └─────────────────────────────────────────────────────────────────┘
+
+  ┌─────────────────────────────────────────────────────────────────┐
+  │  STEP 2  │  Re-run this workflow step                           │
+  ├─────────────────────────────────────────────────────────────────┤
+  │                                                                  │
+  │    Actions  ──►  [ Re-run jobs ]  ──►  Re-run failed jobs      │
+  │                                                                  │
+  └─────────────────────────────────────────────────────────────────┘
+
+  ┌─────────────────────────────────────────────────────────────────┐
+  │  RESULT  │  Unit + functional tests run!                        │
+  ├─────────────────────────────────────────────────────────────────┤
+  │                                                                  │
+  │         cicd-mbridge-testing  ◄── unit + functional tests      │
+  │                                                                  │
+  │         Tests run against MBridge using the merge commit       │
+  │         SHA of your pull request.                              │
+  │                                                                  │
+  └─────────────────────────────────────────────────────────────────┘
+
+                ┌────────────────────────────────────┐
+                │  Label present?     NO   → unit    │
+                │  Label present?     YES  → unit +  │
+                │                           functional│
+                └────────────────────────────────────┘
+
+  NOTE: The label must be present BEFORE the re-run is triggered.
+        The CI checks for "Run MBridge tests" at runtime.
+
+  NOTE: All MBridge test results are optional — failures do not
+        block merging your PR.
+EOF

.github/scripts/sync_team_usergroups.py

@@ -29,7 +29,12 @@
 
 # Constants
 GITHUB_API_URL = "https://api.github.com"
-PARENT_TEAM_SLUG = "mcore-reviewers"
+
+# Teams whose *children* are each synced to their own Slack usergroup
+PARENT_TEAM_SLUGS = ["mcore-reviewers"]
+
+# Teams synced directly (the team itself, not its children)
+DIRECT_TEAM_SLUGS = ["mcore-engineers"]
 
 # Caches for email and Slack lookups
 _email_cache = {}
@@ -83,6 +88,8 @@ def github_team_to_slack_usergroup(team_slug):
         name = name[5:]  # Remove "core-"
     elif name.startswith("megatron-"):
         name = name[9:]  # Remove "megatron-"
+    elif name.startswith("mcore-"):
+        name = name[6:]  # Remove "mcore-"
 
     # Remove "-and-"
     name = name.replace("-and-", "-")
@@ -437,13 +444,13 @@ def sync_team_to_usergroup(team_slug, usergroup_handle, dry_run=False):
         return False
 
 
-def get_team_to_usergroup_mapping():
-    """Fetch child teams of mcore-reviewers and generate the mapping."""
+def get_team_to_usergroup_mapping(parent_team_slug):
+    """Fetch child teams of a parent team and generate the mapping."""
     org = get_org()
-    child_teams = get_child_teams(org, PARENT_TEAM_SLUG)
+    child_teams = get_child_teams(org, parent_team_slug)
 
     if not child_teams:
-        print(f"Error: No child teams found under '{PARENT_TEAM_SLUG}'")
+        print(f"Error: No child teams found under '{parent_team_slug}'")
         return {}
 
     mapping = {}
@@ -454,10 +461,30 @@ def get_team_to_usergroup_mapping():
     return mapping
 
 
-def sync_all_teams(dry_run=False):
-    """Sync all GitHub teams under mcore-reviewers to their Slack usergroups."""
-    print(f"Fetching child teams of '{PARENT_TEAM_SLUG}'...")
-    team_to_usergroup = get_team_to_usergroup_mapping()
+def sync_all_teams(dry_run=False, parent_teams=None, direct_teams=None):
+    """Sync GitHub teams to their Slack usergroups.
+
+    Args:
+        parent_teams: List of team slugs whose *children* are each synced.
+                      Defaults to PARENT_TEAM_SLUGS.
+        direct_teams: List of team slugs synced directly (not their children).
+                      Defaults to DIRECT_TEAM_SLUGS.
+    """
+    if parent_teams is None:
+        parent_teams = PARENT_TEAM_SLUGS
+    if direct_teams is None:
+        direct_teams = DIRECT_TEAM_SLUGS
+
+    team_to_usergroup = {}
+
+    for parent_slug in parent_teams:
+        print(f"Fetching child teams of '{parent_slug}'...")
+        mapping = get_team_to_usergroup_mapping(parent_slug)
+        team_to_usergroup.update(mapping)
+
+    for team_slug in direct_teams:
+        usergroup_handle = github_team_to_slack_usergroup(team_slug)
+        team_to_usergroup[team_slug] = usergroup_handle
 
     if not team_to_usergroup:
         return False
@@ -504,12 +531,40 @@ def main():
         action="store_true",
         help="List all configured team-to-usergroup mappings",
     )
+    parser.add_argument(
+        "--parent-team",
+        action="append",
+        dest="parent_teams",
+        metavar="SLUG",
+        help=(
+            "Sync all children of this GitHub team (can be repeated). "
+            f"Defaults to: {PARENT_TEAM_SLUGS}"
+        ),
+    )
+    parser.add_argument(
+        "--team",
+        action="append",
+        dest="direct_teams",
+        metavar="SLUG",
+        help=(
+            "Sync this GitHub team directly (can be repeated). "
+            f"Defaults to: {DIRECT_TEAM_SLUGS}"
+        ),
+    )
 
     args = parser.parse_args()
 
+    # Use CLI values when provided, otherwise fall back to module-level defaults
+    parent_teams = args.parent_teams if args.parent_teams is not None else PARENT_TEAM_SLUGS
+    direct_teams = args.direct_teams if args.direct_teams is not None else DIRECT_TEAM_SLUGS
+
     if args.list:
-        print(f"Fetching child teams of '{PARENT_TEAM_SLUG}'...")
-        team_to_usergroup = get_team_to_usergroup_mapping()
+        team_to_usergroup = {}
+        for parent_slug in parent_teams:
+            print(f"Fetching child teams of '{parent_slug}'...")
+            team_to_usergroup.update(get_team_to_usergroup_mapping(parent_slug))
+        for team_slug in direct_teams:
+            team_to_usergroup[team_slug] = github_team_to_slack_usergroup(team_slug)
         if not team_to_usergroup:
             sys.exit(1)
         print("\nTeam-to-usergroup mappings:")
@@ -519,7 +574,9 @@ def main():
             print(f"{team:<35} @{usergroup:<29}")
         return
 
-    success = sync_all_teams(dry_run=args.dry_run)
+    success = sync_all_teams(
+        dry_run=args.dry_run, parent_teams=parent_teams, direct_teams=direct_teams
+    )
     sys.exit(0 if success else 1)
 
 

.github/workflows/_build_test_publish_wheel.yml

@@ -17,8 +17,6 @@ on:
         type: boolean
         default: true
     secrets:
-      TWINE_USERNAME:
-        required: true
       TWINE_PASSWORD:
         required: true
 
@@ -147,7 +145,6 @@ jobs:
     needs: [build-and-test-wheels]
     runs-on: ubuntu-latest
     if: inputs.no-publish == false
-    environment: ${{ (github.ref == 'refs/heads/main' || startsWith(github.ref, 'refs/heads/r')) && 'main' || 'public' }}
     strategy:
       fail-fast: false
       matrix:
@@ -170,7 +167,7 @@ jobs:
 
       - name: Publish wheels
         env:
-          TWINE_USERNAME: ${{ secrets.TWINE_USERNAME }}
+          TWINE_USERNAME: __token__
           TWINE_PASSWORD: ${{ secrets.TWINE_PASSWORD }}
           TWINE_REPOSITORY: ${{ (github.ref == 'refs/heads/main' || startsWith(github.ref, 'refs/heads/r')) && 'pypi' || 'testpypi' }}
           PLATFORM: ${{ matrix.PLATFORM }}