[dev] pull main 260220

.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", "RPrenger", "ShriyaRishab", "Victarry", "Wohox", "ZhiyuLi-Nvidia", "ahmadki", "aklife97", "ananthsub", "asolergi-nv", "buptzyb", "chtruong814", "cspades", "cuichenx", "deepakn94", "dimapihtar", "dingqingy-nv", "duncanriach", "erhoo82", "ericharper", "fanshiqing", "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", "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"]
+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/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/_update_dependencies.yml

@@ -37,11 +37,20 @@ jobs:
         with:
           ref: ${{ env.TARGET_BRANCH }}
 
+      - name: Mock test data
+        run: mkdir -p assets/
+
+      - name: Fetch NGC Version
+        id: ngc-version
+        run: |
+          NGC_VERSION=$(cat docker/.ngc_version.dev)
+          echo "NGC_VERSION=${NGC_VERSION}" | tee -a "$GITHUB_OUTPUT"
+
       - name: Build container
         env:
           GH_TOKEN: ${{ secrets.PAT }}
         run: |
-          docker build -f docker/Dockerfile.ci.dev --build-arg FROM_IMAGE_NAME="nvcr.io/nvidia/pytorch:25.06-py3" --target=main -t megatron-core .
+          docker build -f docker/Dockerfile.ci.dev --build-arg FROM_IMAGE_NAME="${{ steps.ngc-version.outputs.NGC_VERSION }}" --target=main -t megatron-core .
 
       - name: Create bump branch if not exists
         run: |
@@ -86,18 +95,6 @@ jobs:
           token: ${{ secrets.PAT }}
           ref: ${{ env.TARGET_BRANCH }}
 
-      - name: Install GPG
-        run: sudo apt-get install -y gnupg2
-
-      - name: Import GPG key (for signing)
-        uses: crazy-max/ghaction-import-gpg@e89d40939c28e39f97cf32126055eeae86ba74ec
-        id: gpg-action
-        with:
-          gpg_private_key: ${{ secrets.SSH_KEY }}
-          passphrase: ${{ secrets.SSH_PWD }}
-          git_user_signingkey: true
-          git_commit_gpgsign: true
-
       - name: Rebase against ${{ env.SOURCE_BRANCH }}
         run: |
           if git ls-remote --exit-code origin ${{ env.SOURCE_BRANCH }}; then
@@ -129,4 +126,102 @@ jobs:
             🙏 Please merge this PR only if the CI workflow completed successfully.
           commit-message: ${{ env.title }}
           signoff: true
-          committer: "${{ steps.gpg-action.outputs.name }} <${{ steps.gpg-action.outputs.email }}>"
+          committer: "github-actions[bot] <github-actions[bot]@users.noreply.github.com>"
+
+      - name: Post /ok to test comment
+        env:
+          GH_TOKEN: ${{ secrets.PAT }}
+        run: |
+          PR_NUMBER="${{ steps.create-pull-request.outputs.pull-request-number }}"
+          if [ -z "$PR_NUMBER" ]; then
+            echo "No PR was created, skipping comment"
+            exit 0
+          fi
+          SHA="${{ steps.create-pull-request.outputs.pull-request-head-sha }}"
+          gh pr comment "$PR_NUMBER" --body "/ok to test $SHA"
+
+      - name: Wait for CI checks
+        env:
+          GH_TOKEN: ${{ secrets.PAT }}
+        run: |
+          PR_NUMBER="${{ steps.create-pull-request.outputs.pull-request-number }}"
+          if [ -z "$PR_NUMBER" ]; then
+            echo "No PR was created, skipping wait"
+            exit 0
+          fi
+
+          # Fetch required status checks from branch protection rules
+          REQUIRED_CHECKS=$(gh api \
+            "repos/${{ github.repository }}/branches/${{ env.TARGET_BRANCH }}/protection/required_status_checks" \
+            --jq '.checks[].context' 2>/dev/null \
+            || gh api \
+            "repos/${{ github.repository }}/branches/${{ env.TARGET_BRANCH }}/protection/required_status_checks" \
+            --jq '.contexts[]' 2>/dev/null \
+            || true)
+
+          if [ -z "$REQUIRED_CHECKS" ]; then
+            echo "No branch protection rules found for ${{ env.TARGET_BRANCH }}, skipping wait"
+            exit 0
+          fi
+
+          echo "Required checks from branch protection:"
+          echo "$REQUIRED_CHECKS"
+
+          echo "Waiting for required checks to complete on PR #$PR_NUMBER..."
+          i=0
+          INITIALIZED=false
+          while true; do
+            i=$((i + 1))
+            CHECKS_JSON=$(gh pr checks "$PR_NUMBER" --json name,state 2>/dev/null || echo "[]")
+            ALL_DONE=true
+            FAILED_CHECKS=""
+            while IFS= read -r check; do
+              CHECK_STATE=$(echo "$CHECKS_JSON" | jq -r --arg name "$check" '.[] | select(.name == $name) | .state // ""' | tr '[:upper:]' '[:lower:]')
+              case "$CHECK_STATE" in
+                *success*|*pass*|*skip*|*neutral*) ;;
+                *pending*|*queued*|*progress*|*waiting*|*request*|"")
+                  ALL_DONE=false
+                  INITIALIZED=true
+                  break
+                  ;;
+                *)
+                  if [ "$INITIALIZED" = "true" ]; then
+                    FAILED_CHECKS="${FAILED_CHECKS}  - ${check} (${CHECK_STATE})"$'\n'
+                  else
+                    ALL_DONE=false
+                  fi
+                  ;;
+              esac
+            done <<< "$REQUIRED_CHECKS"
+            if [ "$ALL_DONE" = "true" ]; then
+              if [ -n "$FAILED_CHECKS" ]; then
+                echo "Required check(s) did not pass:"
+                echo "$FAILED_CHECKS"
+                exit 1
+              fi
+              echo "All required checks passed!"
+              break
+            fi
+            echo "Checks not yet complete (attempt $i), retrying in 30s..."
+            sleep 30
+          done
+
+      - name: Merge PR
+        env:
+          title: "chore(beep boop 🤖): Bump `uv.lock` (${{ env.TARGET_BRANCH}}) (${{ needs.pre-flight.outputs.date }})"
+        run: |
+          PR_NUMBER="${{ steps.create-pull-request.outputs.pull-request-number }}"
+          if [ -z "$PR_NUMBER" ]; then
+            echo "No PR was created, skipping merge"
+            exit 0
+          fi
+          git config user.name "github-actions[bot]"
+          git config user.email "github-actions[bot]@users.noreply.github.com"
+          git fetch origin ${{ env.SOURCE_BRANCH }}
+          git fetch origin ${{ env.TARGET_BRANCH }}
+          git checkout ${{ env.TARGET_BRANCH }}
+          git merge --squash origin/${{ env.SOURCE_BRANCH }}
+          git commit -m "${{ env.title }}"
+          git pull --rebase origin ${{ env.TARGET_BRANCH }}
+          git push origin ${{ env.TARGET_BRANCH }}
+          git push origin --delete ${{ env.SOURCE_BRANCH }}