Skip to content

Commit 208be3b

Browse files
committed
Adapt org management to rfc-0036
- org/ -> orgs/ - cloudfoundry.yml -> orgs.yml - contributor.yml schema supports multiple orgs - adapted references in docs and rfcs - org automation still supports only the cloudfoundry org
1 parent 8c7d8fd commit 208be3b

26 files changed

+322
-296
lines changed

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@ jobs:
2222
id: uds
2323
run: |
2424
python -m pip install --upgrade pip
25-
pip install -r community/org/requirements.txt
26-
python community/org/org_user_management.py
25+
pip install -r community/orgs/requirements.txt
26+
python community/orgs/org_user_management.py
2727
env:
2828
GH_TOKEN: ${{ secrets.GH_TOKEN }}
2929
INACTIVE_USER_MANAGEMENT_TAG_USERS: ${{ secrets.INACTIVE_USER_MANAGEMENT_TAG_USERS }}
@@ -32,7 +32,7 @@ jobs:
3232
uses: peter-evans/create-pull-request@v5
3333
with:
3434
path: community
35-
add-paths: org/contributors.yml
35+
add-paths: orgs/contributors.yml
3636
commit-message: Delete inactive users
3737
branch: delete-inactive-users
3838
title: 'Inactive users to be deleted'

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ name: 'Check Github Organization Settings PRs'
22
on:
33
pull_request:
44
paths:
5-
- 'org/*'
5+
- 'orgs/*'
66
- 'toc/TOC.md'
77
- 'toc/working-groups/*.md'
88
- '.github/workflows/org-management-check-prs.yml'
@@ -19,5 +19,5 @@ jobs:
1919
- name: Generate github org configuration
2020
run: |
2121
python -m pip install --upgrade pip
22-
pip install -r community/org/requirements.txt
23-
python community/org/org_management.py -o cloudfoundry.out.yml -b branchprotection.out.yml
22+
pip install -r community/orgs/requirements.txt
23+
python community/orgs/org_management.py -o orgs.out.yml -b branchprotection.out.yml

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

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@ name: 'Org Automation CI'
22
on:
33
pull_request:
44
paths:
5-
- 'org/*.py'
6-
- 'org/requirements*'
7-
- 'org/pyproject.toml'
5+
- 'orgs/*.py'
6+
- 'orgs/requirements*'
7+
- 'orgs/pyproject.toml'
88
- '.github/workflows/org-management-ci.yml'
99
jobs:
1010
org-automation-tests:
@@ -19,13 +19,13 @@ jobs:
1919
- name: pip install
2020
run: |
2121
python -m pip install --upgrade pip
22-
pip install -r community/org/requirements.txt
23-
pip install -r community/org/requirements-dev.txt
22+
pip install -r community/orgs/requirements.txt
23+
pip install -r community/orgs/requirements-dev.txt
2424
- name: flake8 and black
2525
run: |
26-
cd community/org
26+
cd community/orgs
2727
python -m flake8
2828
- name: unit tests
2929
run: |
30-
cd community/org
30+
cd community/orgs
3131
python -m unittest discover -s .

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -41,17 +41,17 @@ jobs:
4141
with:
4242
entrypoint: /bin/sh
4343
# Switch back to app auth once following PR gets merged: https://github.com/kubernetes/test-infra/pull/24882
44-
# args: --dump-full --dump cloudfoundry --github-app-id=${{ secrets.GH_APP_ID }} --github-app-private-key-path=private_key > org/cloudfoundry.yml
45-
args: -c "/ko-app/peribolos --dump-full --dump cloudfoundry --github-endpoint http://ghproxy:8888 --github-token-path=token > community/org/cloudfoundry.yml"
44+
# args: --dump-full --dump cloudfoundry --github-app-id=${{ secrets.GH_APP_ID }} --github-app-private-key-path=private_key > orgs/orgs.yml
45+
args: -c "/ko-app/peribolos --dump-full --dump cloudfoundry --github-endpoint http://ghproxy:8888 --github-token-path=token > community/orgs/orgs.yml"
4646
- name: Create Pull Request
4747
uses: peter-evans/create-pull-request@v5
4848
with:
4949
path: community
50-
add-paths: org/cloudfoundry.yml
50+
add-paths: orgs/orgs.yml
5151
commit-message: Run peribolos -dump-full
5252
branch: peribolos-dump
5353
draft: true
54-
title: 'Sync org/cloudfoundry.yml with reality'
54+
title: 'Sync orgs/orgs.yml with reality'
5555
body: |
5656
This PR contains a fresh peribolos dump.
5757
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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ on:
44
branches:
55
- 'main'
66
paths:
7-
- 'org/*'
7+
- 'orgs/*'
88
- 'toc/TOC.md'
99
- 'toc/working-groups/*.md'
1010
- '.github/workflows/org-management.yml'
@@ -43,8 +43,8 @@ jobs:
4343
- name: Generate github org configuration
4444
run: |
4545
python -m pip install --upgrade pip
46-
pip install -r community/org/requirements.txt
47-
python community/org/org_management.py -o cloudfoundry.out.yml -b branchprotection.out.yml
46+
pip install -r community/orgs/requirements.txt
47+
python community/orgs/org_management.py -o orgs.out.yml -b branchprotection.out.yml
4848
- name: write github private key
4949
run: |
5050
echo "${GH_PRIVATE_KEY}" > private_key
@@ -65,7 +65,7 @@ jobs:
6565
--github-app-id=${{ secrets.GH_APP_ID }}
6666
--github-app-private-key-path=private_key
6767
--require-self=false
68-
--config-path=cloudfoundry.out.yml
68+
--config-path=orgs.out.yml
6969
--fix-org
7070
--fix-org-members
7171
--fix-repos
@@ -105,8 +105,8 @@ jobs:
105105
- name: Generate github org configuration
106106
run: |
107107
python -m pip install --upgrade pip
108-
pip install -r community/org/requirements.txt
109-
python community/org/org_management.py -o cloudfoundry.out.yml -b branchprotection.out.yml
108+
pip install -r community/orgs/requirements.txt
109+
python community/orgs/org_management.py -o orgs.out.yml -b branchprotection.out.yml
110110
- name: write github private key
111111
run: |
112112
echo "${GH_PRIVATE_KEY}" > private_key

.github/workflows/project-sync.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ jobs:
1111
- uses: actions/checkout@v4
1212
- id: matrix
1313
run: |
14-
echo "::set-output name=matrix::$(./org/generate_working_group_projects_sync_config.sh)"
14+
echo "::set-output name=matrix::$(./orgs/generate_working_group_projects_sync_config.sh)"
1515
outputs:
1616
matrix: ${{ steps.matrix.outputs.matrix }}
1717

org/contributors.yml

Lines changed: 0 additions & 224 deletions
This file was deleted.
File renamed without changes.

0 commit comments

Comments
 (0)