Automerge every 4 hours any labeled PR with passing tests

.github/workflows/auto-merge-successful-prs.yaml

@@ -0,0 +1,30 @@
+name: Auto-merge Successful PRs
+
+on:
+  workflow_dispatch:
+  schedule:
+    - cron: "0 */4 * * *"  # Every 4 hours
+
+permissions:
+  contents: read
+  pull-requests: write
+
+jobs:
+  merge-successful-prs:
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Harden Runner
+        uses: step-security/harden-runner@v2
+        with:
+          egress-policy: audit
+      - name: Checking out repo
+        uses: actions/checkout@v4
+        with:
+          ssh-key: ${{ secrets.BOT_SSH_KEY }}
+      - uses: actions/setup-python@v5
+        with:
+          python-version: '3.12'
+      - name: Auto-merge pull requests if all status checks pass
+        run: |
+            build-scripts/hack/auto-merge-successful-prs.py

.github/workflows/update-branches.yaml

@@ -41,7 +41,7 @@ jobs:
       - name: Sync ${{ github.ref }} to ${{ steps.determine.outputs.branch }}
         uses: actions/checkout@v4
         with:
-          ssh-key: ${{ secrets.DEPLOY_KEY_TO_UPDATE_STRICT_BRANCH }}
+          ssh-key: ${{ secrets.BOT_SSH_KEY }}
       - name: Apply ${{ matrix.patch }} patch
         run: |
           git checkout -b ${{ steps.determine.outputs.branch }}

.github/workflows/update-components.yaml

@@ -33,7 +33,7 @@ jobs:
         uses: actions/checkout@v4
         with:
           ref: ${{ matrix.branch }}
-          ssh-key: ${{ secrets.DEPLOY_KEY_TO_UPDATE_STRICT_BRANCH }}
+          ssh-key: ${{ secrets.BOT_SSH_KEY }}
 
       - name: Setup Python
         uses: actions/setup-python@v5
@@ -51,10 +51,11 @@ jobs:
       - name: Create pull request
         uses: peter-evans/create-pull-request@v6
         with:
-          git-token: ${{ secrets.DEPLOY_KEY_TO_UPDATE_STRICT_BRANCH }}
           commit-message: "[${{ matrix.branch }}] Update component versions"
           title: "[${{ matrix.branch }}] Update component versions"
           body: "[${{ matrix.branch }}] Update component versions"
           branch: "autoupdate/sync/${{ matrix.branch }}"
+          labels: |
+            automerge
           delete-branch: true
           base: ${{ matrix.branch }}

build-scripts/hack/auto-merge-successful-pr.py

@@ -0,0 +1,55 @@
+#!/bin/env python3
+
+import shlex
+import subprocess
+import json
+
+LABEL = "automerge"
+APPROVE_MSG = "All status checks passed for PR #{}."
+
+
+def sh(cmd: str) -> str:
+    """Run a shell command and return its output."""
+    _pipe = subprocess.PIPE
+    result = subprocess.run(shlex.split(cmd), stdout=_pipe, stderr=_pipe, text=True)
+    if result.returncode != 0:
+        raise Exception(f"Error running command: {cmd}\nError: {result.stderr}")
+    return result.stdout.strip()
+
+
+def get_pull_requests() -> list:
+    """Fetch open pull requests matching some label."""
+    prs_json = sh("gh pr list --state open --json number,labels")
+    prs = json.loads(prs_json)
+    return [pr for pr in prs if any(label["name"] == LABEL for label in pr["labels"])]
+
+
+def check_pr_passed(pr_number) -> bool:
+    """Check if all status checks passed for the given PR."""
+    checks_json = sh(f"gh pr checks {pr_number} --json bucket")
+    checks = json.loads(checks_json)
+    return all(check["bucket"] == "pass" for check in checks)
+
+
+def approve_and_merge_pr(pr_number) -> None:
+    """Approve and merge the PR."""
+    print(APPROVE_MSG.format(pr_number) + "Proceeding with merge...")
+    sh(f'gh pr review {pr_number} --approve -b "{APPROVE_MSG.format(pr_number)}"')
+    sh(f"gh pr merge {pr_number} --auto --squash")
+
+
+def process_pull_requests():
+    """Process the PRs and merge if checks have passed."""
+    prs = get_pull_requests()
+
+    for pr in prs:
+        pr_number: int = pr["number"]
+
+        if check_pr_passed(pr_number):
+            approve_and_merge_pr(pr_number)
+        else:
+            print(f"Status checks have not passed for PR #{pr_number}. Skipping merge.")
+
+
+if __name__ == "__main__":
+    process_pull_requests()

build-scripts/patches/moonray/apply

@@ -2,9 +2,12 @@
 
 DIR="$(realpath "$(dirname "${0}")")"
 
-# Configure git author
-git config user.email [email protected]
-git config user.name k8s-bot
+# Configure git author if unset
+git_email=$(git config --default "" user.email)
+if [ -z "${git_email}" ]; then
+    git config user.email [email protected]
+    git config user.name 'k8s-team-ci (CDK Bot)'
+fi
 
 # Remove unrelated tests
 rm "${DIR}/../../../tests/integration/tests/test_cilium_e2e.py"

build-scripts/patches/strict/apply

@@ -3,8 +3,11 @@
 DIR="$(realpath "$(dirname "${0}")")"
 
 # Configure git author
-git config user.email [email protected]
-git config user.name k8s-bot
+git_email=$(git config --default "" user.email)
+if [ -z "${git_email}" ]; then
+    git config user.email [email protected]
+    git config user.name 'k8s-team-ci (CDK Bot)'
+fi
 
 # Apply strict patch
 git am "${DIR}/0001-Strict-patch.patch"