Merge pull request #500 from cloudfoundry/github-org-automation

Generate teams and repo access  for Admin WG

Author: AP-Hunt

org/org_management.py

@@ -64,9 +64,11 @@ def load_from_project(self):
             OrgGenerator._validate_contributors(contributors_yaml)
             self.contributors = set(contributors_yaml["contributors"])
 
-        # working group charters (including TOC), ignore WGs without yaml block
+        # working group charters (including TOC and ADMIN), ignore WGs without yaml block
         self.toc = OrgGenerator._read_wg_charter(f"{_SCRIPT_PATH}/../toc/TOC.md")
-        for wg_file in glob.glob(f"{_SCRIPT_PATH}/../toc/working-groups/*.md"):
+        wg_files = glob.glob(f"{_SCRIPT_PATH}/../toc/working-groups/*.md")
+        wg_files += glob.glob(f"{_SCRIPT_PATH}/../toc/ADMIN.md")
+        for wg_file in wg_files:
             if not wg_file.endswith("/WORKING-GROUPS.md"):
                 wg = OrgGenerator._read_wg_charter(wg_file)
                 if wg:

org/readme.md

@@ -5,6 +5,7 @@ The projects, teams and org membership in github org 'cloudfoundry' are maintain
 - [cloudfoundry.yml](https://github.com/cloudfoundry/community/blob/main/org/cloudfoundry.yml) - static org configuration and projects
 - [contributors.yml](https://github.com/cloudfoundry/community/blob/main/org/contributors.yml) - list of [Contributors](https://github.com/cloudfoundry/community/blob/main/toc/ROLES.md#contributor)
 - [TOC.md](https://github.com/cloudfoundry/community/blob/main/toc/TOC.md) - projects owned by the TOC (specified in yaml block)
+- [ADMIN.md](https://github.com/cloudfoundry/community/blob/main/toc/ADMIN.md) - special WG for maintaining administrative repositories owned by CFF staff
 - [Working Group Charters](https://github.com/cloudfoundry/community/tree/main/toc/working-groups) - projects owned by working groups (specified in yaml block)
 
 Once approved and merged, the github action [org-management.yml](https://github.com/cloudfoundry/community/actions/workflows/org-management.yml) compiles a resulting cloudfoundry org configuration from the files mentioned above and applies it with [peribolos](https://github.com/kubernetes/test-infra/tree/master/prow/cmd/peribolos).

org/test_org_management.py

@@ -338,6 +338,7 @@ def test_cf_org(self):
         self.assertEqual("Technical Oversight Committee", o.toc["name"])
         self.assertGreater(len(o.contributors), 100)
         self.assertGreater(len(o.working_groups), 5)
+        self.assertEqual(1, len([wg for wg in o.working_groups if "Admin" in wg["name"]]))
         self.assertEqual(1, len([wg for wg in o.working_groups if "Deployments" in wg["name"]]))
         # packeto WG charter has no yaml block
         self.assertEqual(0, len([wg for wg in o.working_groups if "packeto" in wg["name"].lower()]))

toc/ADMIN.md

@@ -23,6 +23,7 @@ execution_leads:
   github: christopherclark
 - name: Ram Iyengar
   github: ramiyengar
+technical_leads: []
 bots: []
 areas:
 - name: Admin