Adapt org management to rfc-0036

.github/workflows/org-inactive-user-management.yml

@@ -22,8 +22,8 @@ jobs:
         id: uds
         run: |
           python -m pip install --upgrade pip
-          pip install -r community/org/requirements.txt
-          python community/org/org_user_management.py
+          pip install -r community/orgs/requirements.txt
+          python community/orgs/org_user_management.py
         env:
           GH_TOKEN: ${{ secrets.GH_TOKEN }}
           INACTIVE_USER_MANAGEMENT_TAG_USERS: ${{ secrets.INACTIVE_USER_MANAGEMENT_TAG_USERS }}
@@ -32,7 +32,7 @@ jobs:
         uses: peter-evans/create-pull-request@v5
         with:
           path: community
-          add-paths: org/contributors.yml
+          add-paths: orgs/contributors.yml
           commit-message: Delete inactive users
           branch: delete-inactive-users
           title: 'Inactive users to be deleted'

.github/workflows/org-management-check-prs.yml

@@ -2,7 +2,7 @@ name: 'Check Github Organization Settings PRs'
 on:
   pull_request:
     paths:
-      - 'org/*'
+      - 'orgs/*'
       - 'toc/TOC.md'
       - 'toc/working-groups/*.md'
       - '.github/workflows/org-management-check-prs.yml'
@@ -19,5 +19,5 @@ jobs:
       - name: Generate github org configuration
         run: |
           python -m pip install --upgrade pip
-          pip install -r community/org/requirements.txt
-          python community/org/org_management.py -o cloudfoundry.out.yml -b branchprotection.out.yml
+          pip install -r community/orgs/requirements.txt
+          python community/orgs/org_management.py -o orgs.out.yml -b branchprotection.out.yml

.github/workflows/org-management-ci.yml

@@ -2,9 +2,9 @@ name: 'Org Automation CI'
 on:
   pull_request:
     paths:
-      - 'org/*.py'
-      - 'org/requirements*'
-      - 'org/pyproject.toml'
+      - 'orgs/*.py'
+      - 'orgs/requirements*'
+      - 'orgs/pyproject.toml'
       - '.github/workflows/org-management-ci.yml'
 jobs:
   org-automation-tests:
@@ -19,13 +19,13 @@ jobs:
       - name: pip install
         run: |
           python -m pip install --upgrade pip
-          pip install -r community/org/requirements.txt
-          pip install -r community/org/requirements-dev.txt
+          pip install -r community/orgs/requirements.txt
+          pip install -r community/orgs/requirements-dev.txt
       - name: flake8 and black
         run: |
-          cd community/org
+          cd community/orgs
           python -m flake8
       - name: unit tests
         run: |
-          cd community/org
+          cd community/orgs
           python -m unittest discover -s .

.github/workflows/org-management-peribolos-dump.yml

@@ -41,17 +41,17 @@ jobs:
         with:
           entrypoint: /bin/sh
           # Switch back to app auth once following PR gets merged: https://github.com/kubernetes/test-infra/pull/24882
-          # args: --dump-full --dump cloudfoundry --github-app-id=${{ secrets.GH_APP_ID }} --github-app-private-key-path=private_key > org/cloudfoundry.yml
-          args: -c "/ko-app/peribolos --dump-full --dump cloudfoundry --github-endpoint http://ghproxy:8888 --github-token-path=token > community/org/cloudfoundry.yml"
+          # args: --dump-full --dump cloudfoundry --github-app-id=${{ secrets.GH_APP_ID }} --github-app-private-key-path=private_key > orgs/orgs.yml
+          args: -c "/ko-app/peribolos --dump-full --dump cloudfoundry --github-endpoint http://ghproxy:8888 --github-token-path=token > community/orgs/orgs.yml"
       - name: Create Pull Request
         uses: peter-evans/create-pull-request@v5
         with:
           path: community
-          add-paths: org/cloudfoundry.yml
+          add-paths: orgs/orgs.yml
           commit-message: Run peribolos -dump-full
           branch: peribolos-dump
           draft: true
-          title: 'Sync org/cloudfoundry.yml with reality'
+          title: 'Sync orgs/orgs.yml with reality'
           body: |
             This PR contains a fresh peribolos dump.
             PR is intended for debugging. Don't merge as-is because parts of the cloudfoundry org configuration are generated from WG charters.

.github/workflows/org-management.yml

@@ -4,7 +4,7 @@ on:
     branches:
       - 'main'
     paths:
-      - 'org/*'
+      - 'orgs/*'
       - 'toc/TOC.md'
       - 'toc/working-groups/*.md'
       - '.github/workflows/org-management.yml'
@@ -43,8 +43,8 @@ jobs:
       - name: Generate github org configuration
         run: |
           python -m pip install --upgrade pip
-          pip install -r community/org/requirements.txt
-          python community/org/org_management.py -o cloudfoundry.out.yml -b branchprotection.out.yml
+          pip install -r community/orgs/requirements.txt
+          python community/orgs/org_management.py -o orgs.out.yml -b branchprotection.out.yml
       - name: write github private key
         run: |
           echo "${GH_PRIVATE_KEY}" > private_key
@@ -65,7 +65,7 @@ jobs:
             --github-app-id=${{ secrets.GH_APP_ID }}
             --github-app-private-key-path=private_key
             --require-self=false
-            --config-path=cloudfoundry.out.yml
+            --config-path=orgs.out.yml
             --fix-org
             --fix-org-members
             --fix-repos
@@ -105,8 +105,8 @@ jobs:
       - name: Generate github org configuration
         run: |
           python -m pip install --upgrade pip
-          pip install -r community/org/requirements.txt
-          python community/org/org_management.py -o cloudfoundry.out.yml -b branchprotection.out.yml
+          pip install -r community/orgs/requirements.txt
+          python community/orgs/org_management.py -o orgs.out.yml -b branchprotection.out.yml
       - name: write github private key
         run: |
           echo "${GH_PRIVATE_KEY}" > private_key

.github/workflows/project-sync.yml

@@ -11,7 +11,7 @@ jobs:
       - uses: actions/checkout@v4
       - id: matrix
         run: |
-          echo "::set-output name=matrix::$(./org/generate_working_group_projects_sync_config.sh)"
+          echo "::set-output name=matrix::$(./orgs/generate_working_group_projects_sync_config.sh)"
     outputs:
       matrix: ${{ steps.matrix.outputs.matrix }}