MINOR Update asf.yaml collaborators (#17345)

Reviewers: Josep Prat <josep.prat@aiven.io>

.asf.yaml

@@ -16,37 +16,22 @@
 # under the License.
 
 notifications:
-  commits:      commits@kafka.apache.org
+  commits: commits@kafka.apache.org
-  issues:       jira@kafka.apache.org
+  issues: jira@kafka.apache.org
   pullrequests: jira@kafka.apache.org
   jira_options: link label
 
-# This list allows you to trigger builds on pull requests. It can have a maximum of 10 people.
+# This list allows you to triage pull requests and trigger workflow runs on GitHub Actions. It can have a maximum of 10 collaborators.
-# https://cwiki.apache.org/confluence/pages/viewpage.action?spaceKey=INFRA&title=Git+-+.asf.yaml+features#Git.asf.yamlfeatures-JenkinsPRwhitelisting
+# Read more here: https://github.com/apache/infrastructure-asfyaml
-jenkins:
-  github_whitelist:
-    - FrankYang0529
-    - kamalcph
-    - apoorvmittal10
-    - lianetm
-    - brandboat
-    - kirktrue
-    - nizhikov
-    - OmniaGM
-    - dongnuo123
-    - frankvicky
-
-# This list allows you to triage pull requests. It can have a maximum of 10 people.
-# https://cwiki.apache.org/confluence/pages/viewpage.action?spaceKey=INFRA&title=Git+-+.asf.yaml+features#Git.asf.yamlfeatures-AssigningexternalcollaboratorswiththetriageroleonGitHub
 github:
   collaborators:
-    - FrankYang0529
+    - AndrewJSchofield
-    - kamalcph
     - apoorvmittal10
-    - lianetm
     - brandboat
-    - kirktrue
-    - nizhikov
-    - OmniaGM
     - dongnuo123
     - frankvicky
+    - FrankYang0529
+    - kirktrue
+    - m1a2st
+    - nizhikov
+    - OmniaGM

committer-tools/refresh_collaborators.py

@@ -111,12 +111,14 @@ def update_local_yaml_content(yaml_file_path: str, collaborators: List[str]) ->
         f"Updating {yaml_file_path} with {len(collaborators)} new collaborators"
     )
 
+    collaborators.sort(key=str.casefold)
+
     with open(yaml_file_path, "r", encoding="utf-8") as file:
         yaml: YAML = YAML()
+        yaml.indent(mapping=2, sequence=4, offset=2)
         yaml_content: dict = yaml.load(file)
 
-    yaml_content["jenkins"]["github_whitelist"] = collaborators
+    yaml_content["github"]["collaborators"] = collaborators
-    yaml_content["github"]["collaborators"] = collaborators.copy()
 
     with open(yaml_file_path, "w", encoding="utf-8") as file:
         yaml.dump(yaml_content, file)