Dev update muted tests wf (#16456)

naspirato · web-flow · commit 093ff06a3606 · 2025-03-31T15:09:25.000+02:00
diff --git a/.github/scripts/create_or_update_pr.py b/.github/scripts/create_or_update_pr.py
@@ -1,40 +1,101 @@
-# .github/scripts/create_or_update_pr.py
+#!/usr/bin/env python3
 import os
+import argparse
 from github import Github
 
-def create_or_update_pr():
-    GITHUB_TOKEN = os.getenv('GITHUB_TOKEN')
-    BASE_BRANCH = os.getenv('BASE_BRANCH')
-    BRANCH_FOR_PR = os.getenv('BRANCH_FOR_PR')
-    TITLE = os.getenv('TITLE')
-    BODY = os.getenv('BODY')
-    REVIEWERS = os.getenv('REVIEWERS').split(',') if os.getenv('REVIEWERS') else []
+def read_body_from_file(file_path):
+    with open(file_path, 'r') as file:
+        return file.read()
 
-    g = Github(GITHUB_TOKEN)
-    repo = g.get_repo(os.getenv('GITHUB_REPOSITORY'))
+def get_body_content(body_input):
+    """Determines if the body content is a file path or direct text."""
+    if os.path.isfile(body_input):
+        print(f"Body content will be read from file: {body_input}.")
+        return read_body_from_file(body_input)
+    else:
+        print(f"Body content will be taken directly: '{body_input}.'")
+        return body_input
+
+def create_or_update_pr(args, repo):
+    current_pr = None
+    pr_number = None
+    body = get_body_content(args.body)
 
     # Check for an existing PR
-    existing_prs = repo.get_pulls(head=BRANCH_FOR_PR, base=BASE_BRANCH, state='open')
-    existing_pr = None
+    existing_prs = repo.get_pulls(head=args.branch_for_pr, base=args.base_branch, state='open')
     for pr in existing_prs:
-        if pr.title == TITLE:
-            existing_pr = pr
+        if pr.base.ref == args.base_branch and pr.head.ref == args.branch_for_pr:
+            current_pr = pr
             break
-
-    if existing_pr:
-        print(f"Existing PR found. Updating PR #{existing_pr.number}.")
-        # Update existing PR
-        existing_pr.edit(title=TITLE, body=BODY)
-        # Add reviewers
-        if REVIEWERS:
-            existing_pr.create_review_request(reviewers=REVIEWERS)
+    if current_pr:
+        print(f"Existing PR found. Updating PR #{current_pr.number}.")
+        current_pr.edit(title=args.title, body=body)
     else:
         print("No existing PR found. Creating a new PR.")
-        # Create new PR
-        pr = repo.create_pull(title=TITLE, body=BODY, head=BRANCH_FOR_PR, base=BASE_BRANCH)
-        # Add reviewers
-        if REVIEWERS:
-            pr.create_review_request(reviewers=REVIEWERS)
+        current_pr = repo.create_pull(title=args.title, body=body, head=args.branch_for_pr, base=args.base_branch)
+        
+    if args.reviewers:
+        reviewers = args.reviewers.split(',')
+        print(f"Requesting review from: {', '.join(reviewers)}")
+        current_pr.create_review_request(reviewers=reviewers)
+
+    pr_number = current_pr.number
+    if os.environ['GITHUB_OUTPUT']:
+        with open(os.environ['GITHUB_OUTPUT'], 'a') as gh_out:
+            print(f"pr_number={pr_number}", file=gh_out)
+
+    print(f"PR created or updated successfully. PR number: {pr_number}")
+
+def append_to_pr_body(args, repo):
+    body_to_append = get_body_content(args.body)
+    
+    pr = None
+    if args.pr_number:
+        pr = repo.get_pull(args.pr_number)
+    else:
+        existing_prs = repo.get_pulls(head=args.branch_for_pr, base=args.base_branch, state='open')
+        for p in existing_prs:
+            if p.base.ref == args.base_branch and p.head.ref == args.branch_for_pr:
+                pr = p
+                break
+
+    if pr:
+        print(f"Appending to PR #{pr.number}.")
+        current_body = pr.body or ""
+        new_body = current_body + "\n\n" + body_to_append
+        pr.edit(body=new_body)
+    else:
+        print("No matching pull request found to append body.")
 
 if __name__ == '__main__':
-    create_or_update_pr()
+    parser = argparse.ArgumentParser(description='Operate on a GitHub Pull Request')
+    subparsers = parser.add_subparsers(dest='mode', required=True, help='Mode of operation')
+
+    # Subparser for create or update PR mode
+    create_parser = subparsers.add_parser('create_or_update', help='Create or update a pull request')
+    create_parser.add_argument('--base_branch', type=str, required=True, help='Base branch for the PR')
+    create_parser.add_argument('--branch_for_pr', type=str, required=True, help='Branch from which to create the PR')
+    create_parser.add_argument('--title', type=str, required=True, help='Title of the PR')
+    create_parser.add_argument('--body', type=str, default='', required=False, help='Body content of the PR, or path to a file with the content')
+    create_parser.add_argument('--reviewers', type=str, default='', help='Comma separated list of reviewers')
+
+    # Subparser for append PR body mode
+    append_parser = subparsers.add_parser('append_pr_body', help='Append text to the body of an existing pull request')
+    group = append_parser.add_mutually_exclusive_group(required=True)
+    group.add_argument('--pr_number', type=int, help='Pull request number')
+    append_parser.add_argument('--body', type=str, required=True, help='Text to append to the PR body')
+
+    args = parser.parse_args()
+
+    GITHUB_TOKEN = os.getenv('GITHUB_TOKEN')
+    if not GITHUB_TOKEN:
+        raise ValueError("GITHUB_TOKEN environment variable is not set")
+
+    g = Github(GITHUB_TOKEN)
+    repo_name = os.getenv('GITHUB_REPOSITORY', 'ydb-platform/ydb')
+    repo = g.get_repo(repo_name)
+
+    if args.mode == "create_or_update":
+        create_or_update_pr(args, repo)
+    elif args.mode == "append_pr_body":
+        append_to_pr_body(args, repo)
diff --git a/.github/scripts/tests/create_new_muted_ya.py b/.github/scripts/tests/create_new_muted_ya.py
@@ -348,6 +348,16 @@ def create_mute_issues(all_tests, file_path):
 
     print("\n\n")
     print("\n".join(results))
+    if os.environ['GITHUB_OUTPUT']:
+        
+        file_path = os.path.join(os.getcwd(), "created_issues.txt")
+        with open(file_path, 'w') as f:
+            f.write("```\n")
+            f.write("\n".join(results))
+            f.write("\n```")
+            
+        with open(os.environ['GITHUB_OUTPUT'], 'a') as gh_out:
+            gh_out.write(f"created_issues_file={file_path}")
 
 
 def mute_worker(args):
diff --git a/.github/workflows/create_issues_for_muted_tests.yml b/.github/workflows/create_issues_for_muted_tests.yml
@@ -0,0 +1,46 @@
+name: Create issues for muted tests
+
+on:
+  pull_request:
+    types:
+      - labeled
+  pull_request_review:
+    types:
+      - submitted
+env:
+  GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+  BRANCH_FOR_PR: update-muted-ya
+  BASE_BRANCH: main
+  MUTED_YA_FILE_PATH: .github/scripts/tests/muted_ya.txt
+
+jobs:
+  run-python-script:
+    runs-on: ubuntu-latest
+    if: github.event_name == 'pull_request_review' && github.event.review.state == 'approved' && contains(github.pull_request.labels.*.name, 'update_muted_ya') 
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+        with:
+            ref: ${{ env.BRANCH_FOR_PR }}_${{ env.BASE_BRANCH }}
+
+      - name: Install dependencies
+        run: |
+            python -m pip install --upgrade pip
+            pip install ydb[yc] PyGithub
+
+      - name: Setup ydb access
+        uses: ./.github/actions/setup_ci_ydb_service_account_key_file_credentials
+        with:
+            ci_ydb_service_account_key_file_credentials: ${{ secrets.CI_YDB_SERVICE_ACCOUNT_KEY_FILE_CREDENTIALS }}
+
+      - name: Create issues for muted tests
+        id: create_issues
+        run: |
+            .github/scripts/tests/create_new_muted_ya.py create_issues --file_path=${{ github.workspace }}/${{ env.MUTED_YA_FILE_PATH }} 
+    
+      - name: Add issues to PR
+        env:
+            GITHUB_TOKEN: ${{ env.GH_TOKEN }}
+        run: |
+            python .github/scripts/create_or_update_pr.py append_pr_body --pr_number=${{ github.event.pull_request.number }} --body=${{ steps.create_issues.outputs.created_issues_file }}
+        
diff --git a/.github/workflows/update_muted_ya.yml b/.github/workflows/update_muted_ya.yml
@@ -8,7 +8,7 @@ env:
   BRANCH_FOR_PR: update-muted-ya
   TITLE: "Update muted_ya.txt"
   BASE_BRANCH: main
-  REVIEWERS: ydb-platform/ci
+  REVIEWERS: ci
 
 jobs:
   create-or-update-muted-ya:
@@ -38,10 +38,10 @@ jobs:
           git fetch origin
       
           # Checkout BRANCH_FOR_PR, create if it doesn't exist based on BASE_BRANCH
-          if git show-ref --quiet refs/heads/${{ env.BRANCH_FOR_PR }}; then
-            git checkout ${{ env.BRANCH_FOR_PR }}
+          if git show-ref --quiet refs/heads/${{ env.BRANCH_FOR_PR }}_${{ env.BASE_BRANCH }}; then
+            git checkout ${{ env.BRANCH_FOR_PR }}_${{ env.BASE_BRANCH }}
           else
-            git checkout -b ${{ env.BRANCH_FOR_PR }} origin/${{ env.BASE_BRANCH }}
+            git checkout -b ${{ env.BRANCH_FOR_PR }}_${{ env.BASE_BRANCH }} origin/${{ env.BRANCH_FOR_PR }}_${{ env.BASE_BRANCH }}
           fi
       
           # Attempt to rebase BRANCH_FOR_PR onto BASE_BRANCH
@@ -54,12 +54,8 @@ jobs:
             # Reset the branch to BASE_BRANCH
             git reset --hard origin/${{ env.BASE_BRANCH }}
             
-            # Force push the reset branch to remote
-            git push origin ${{ env.BRANCH_FOR_PR }} --force
-          else
-            # If rebase is successful, push the updated branch
-            git push origin ${{ env.BRANCH_FOR_PR }}
           fi
+          git push origin ${{ env.BRANCH_FOR_PR }}_${{ env.BASE_BRANCH }} --force
         
       - name: Run the script
         run: |
@@ -84,6 +80,8 @@ jobs:
         id: pr_description
         run: |
           PR_BODY=''
+          PR_BODY_FILE="pr_body_content.txt"
+
           if [ -s mute_update/deleted_tests_in_mute_debug.txt ]; then
               DELETED_COUNT=$(wc -l < mute_update/deleted_tests_in_mute_debug.txt)
               PR_BODY+=$'**Removed from mute: '"${DELETED_COUNT}**"$'\n\n'
@@ -106,8 +104,10 @@ jobs:
               PR_BODY+=$'\n```\n\n'
           fi
 
-          # Use printf to handle special characters and newlines
-          printf "PR_BODY<<EOF\n%s\nEOF\n" "$PR_BODY" >> $GITHUB_ENV
+          # Save PR_BODY to the file
+          echo "$PR_BODY" > "$PR_BODY_FILE"
+          # Export the path to the file to the GitHub environment
+          echo "PR_BODY_PATH=$PR_BODY_FILE" >> $GITHUB_ENV
 
       - name: Stage changes if any
         if: env.changes == 'true'
@@ -127,7 +127,7 @@ jobs:
         uses: ad-m/github-push-action@v0.8.0
         with:
           github_token: ${{ secrets.GITHUB_TOKEN }}
-          branch: ${{ env.BRANCH_FOR_PR }}
+          branch: ${{ env.BRANCH_FOR_PR }}_${{ env.BASE_BRANCH }}
           force: true
 
       - name: Install PyGithub
@@ -138,10 +138,36 @@ jobs:
         id: create_or_update_pr
         env:
           GITHUB_TOKEN: ${{ env.GH_TOKEN }}
-          BRANCH_FOR_PR: ${{ env.BRANCH_FOR_PR }}
-          TITLE: ${{ env.TITLE }}
-          BASE_BRANCH: ${{ env.BASE_BRANCH }}
-          BODY: ${{ env.PR_BODY }}
-          REVIEWERS: ${{ env.REVIEWERS }}
         run: |
-          python .github/scripts/create_or_update_pr.py
+          python .github/scripts/create_or_update_pr.py create_or_update --base_branch="${{ env.BASE_BRANCH }}" --branch_for_pr="${{ env.BRANCH_FOR_PR }}_${{ env.BASE_BRANCH }}" --title="${{ env.TITLE }}" --body="${{ env.BODY }}"
+  
+      
+      - name: Comment PR
+        uses: actions/github-script@v7
+        with:
+          script: |    
+            github.rest.issues.createComment({
+              issue_number: ${{ steps.create_or_update_pr.outputs.pr_number }},
+              owner: ${{ github.repository_owner }},
+              repo: ${{ github.event.repository.name }},
+              body: ${{ env.PR_BODY }}
+
+            });
+
+            github.rest.issues.addLabels({
+                ...context.repo,
+                issue_number: ${{ steps.create_or_update_pr.outputs.pr_number }},
+                labels: 'update_muted_ya'
+            });
+
+      - name: Add reviewers
+        uses: octokit/request-action@v2.x
+        with:
+          route: POST /repos/{owner}/{repo}/pulls/{pull_number}/requested_reviewers
+          owner: ${{ github.repository_owner }}
+          repo: ${{ github.event.repository.name }}
+          pull_number: ${{ steps.create_or_update_pr.outputs.pr_number }}
+          team_reviewers: ${{ env.REVIEWERS }}  
+          token: ${{ secrets.GITHUB_TOKEN }}
+  
+  
