From ee37a5d64c54355a3780390356297695f95114d2 Mon Sep 17 00:00:00 2001 From: Beyhan Veli Date: Mon, 10 Nov 2025 09:44:31 +0100 Subject: [PATCH 1/3] Add CF Tutorials to CF org automation This prs is adding the `cloudfoundry-tutorials` GitHub org to the CF org automation. Additionally, the pr proposes people who should interest to contribute to the tutorials as reviewers. --- orgs/org_management.py | 2 +- orgs/orgs.yml | 81 +++++++++++++++++++++++++++++++++++++ orgs/test_org_management.py | 4 +- toc/working-groups/docs.md | 23 +++++++++++ 4 files changed, 107 insertions(+), 3 deletions(-) diff --git a/orgs/org_management.py b/orgs/org_management.py index fcb2fede9..7cff6c136 100644 --- a/orgs/org_management.py +++ b/orgs/org_management.py @@ -32,7 +32,7 @@ def construct_mapping(self, node, deep=False): class OrgGenerator: # list of managed orgs, should match ./ORGS.md - _MANAGED_ORGS = ["cloudfoundry"] + _MANAGED_ORGS = ["cloudfoundry", "cloudfoundry-tutorials"] _DEFAULT_ORG = "cloudfoundry" # parameters intended for testing only, all params are yaml docs diff --git a/orgs/orgs.yml b/orgs/orgs.yml index 7bc9ca04c..4222a02cb 100644 --- a/orgs/orgs.yml +++ b/orgs/orgs.yml @@ -2740,3 +2740,84 @@ orgs: privacy: closed repos: terraform-provider-cloudfoundry: admin + cloudfoundry-tutorials: + admins: [] # shall be empty, maintained in TOC.md + billing_email: ap@cloudfoundry.org + company: "" + default_repository_permission: none + description: Cloud Foundry Foundation Tutorials active projects + email: cf-dev@lists.cloudfoundry.org + has_organization_projects: true + has_repository_projects: true + location: Worldwide + members: [] # shall be empty, org members are maintained in contributors.yml and WG charters + members_can_create_repositories: false + name: Cloud Foundry Tutorials + repos: + cf4devs: + description: Cloud Foundry for Developers. In depth, hands on training + has_projects: false + has_wiki: false + korifi-ci: + description: An introduction to the Korifi project + has_projects: false + has_wiki: false + korifi-sample-app: + description: A sample application used in the Korifi tutorial + has_projects: false + has_wiki: false + tutorials: + description: This repository contains the landing page for https://tutorials.cloudfoundry.org and automations + has_projects: false + has_wiki: false + what-is-cf: + description: Tutorial explaining what is Cloud Foundry, the foundation, etc + has_projects: false + has_wiki: false + sample-app: + description: A sample application written in Go used for training purposes + has_projects: false + has_wiki: false + edx: + description: Cloud Foundry educational content in edX + has_projects: false + has_wiki: false + trycf: + description: "" + archived: true + has_projects: false + has_wiki: false + cf4k8s-do: + description: Installing cf-for-k8s on Digital Ocean + archived: true + has_projects: false + has_wiki: false + unhappy-appy: + description: An app that doesn't always start well. For demo and training ONLY + has_projects: false + has_wiki: false + cf4k8s-gke: + description: Learn to deploy cf-for-k8s on Google Kubernetes Engine + archived: true + has_projects: false + has_wiki: false + harness: + description: Simple script to make live-editing easier + archived: true + has_projects: false + has_wiki: false + fake-mysql-broker: + description: A service broker that looks like it provisions MySQL but doesn't actually do anything. Used for training + has_projects: false + has_wiki: false + hugo-whisper-theme: + description: Whisper is a minimal documentation theme for Hugo + archived: true + has_projects: false + has_wiki: false + cf-and-k8s: + description: "" + archived: true + has_projects: false + has_wiki: false + teams: {} diff --git a/orgs/test_org_management.py b/orgs/test_org_management.py index 1a74c1df3..4cb7f3f40 100644 --- a/orgs/test_org_management.py +++ b/orgs/test_org_management.py @@ -760,11 +760,11 @@ def test_generate_branch_protection_multiple_orgs(self): # integration test, depends on data in this repo which may change class TestOrgGeneratorIntegrationTest(unittest.TestCase): def test_cf_org(self): - self.assertEqual(["cloudfoundry"], OrgGenerator._MANAGED_ORGS) + OrgGenerator._MANAGED_ORGS = ["cloudfoundry", "cloudfoundry-tutorials"] o = OrgGenerator() o.load_from_project() - self.assertEqual(1, len(o.org_cfg["orgs"])) + self.assertEqual(2, len(o.org_cfg["orgs"])) self.assertEqual("cloudfoundry", o.toc_org) self.assertEqual("Technical Oversight Committee", o.toc["name"]) self.assertGreater(len(o.contributors["cloudfoundry"]), 100) diff --git a/toc/working-groups/docs.md b/toc/working-groups/docs.md index f945bba52..dacefabb8 100644 --- a/toc/working-groups/docs.md +++ b/toc/working-groups/docs.md @@ -60,4 +60,27 @@ areas: - cloudfoundry/docs-credhub - cloudfoundry/docs-deploying-cf - cloudfoundry/docs-dotnet-core-tutorial +- name: Cloud Foundry Tutorials + approvers: + - name: Steve Greenberg + github: spgreenberg + reviewers: + - name: Benjamin Guttmann + github: benjaminguttmann-avtq + - name: Maurice Brinkmann + github: mauricebrinkmann + - name: Andreas Koppenhöfer + github: akop + - name: Jovan Kostovski + github: chombium + repositories: + - cloudfoundry-tutorials/cf4devs + - cloudfoundry-tutorials/korifi-ci + - cloudfoundry-tutorials/korifi-sample-app + - cloudfoundry-tutorials/tutorials + - cloudfoundry-tutorials/what-is-cf + - cloudfoundry-tutorials/sample-app + - cloudfoundry-tutorials/edx + - cloudfoundry-tutorials/unhappy-appy + - cloudfoundry-tutorials/fake-mysql-broker ``` From eed6d5771925ef5385d236d7e7099176c213b82f Mon Sep 17 00:00:00 2001 From: Beyhan Veli Date: Tue, 11 Nov 2025 11:51:56 +0100 Subject: [PATCH 2/3] Add Anita Flegg as approver --- toc/working-groups/docs.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/toc/working-groups/docs.md b/toc/working-groups/docs.md index dacefabb8..17e2e4260 100644 --- a/toc/working-groups/docs.md +++ b/toc/working-groups/docs.md @@ -64,6 +64,8 @@ areas: approvers: - name: Steve Greenberg github: spgreenberg + - name: Anita Flegg + github: anita-flegg reviewers: - name: Benjamin Guttmann github: benjaminguttmann-avtq From 4e1eed89e6a8b6767b30afae97c48ec651a308bb Mon Sep 17 00:00:00 2001 From: Beyhan Veli Date: Tue, 11 Nov 2025 13:56:03 +0100 Subject: [PATCH 3/3] Add Arsalan Khan as reviewer --- toc/working-groups/docs.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/toc/working-groups/docs.md b/toc/working-groups/docs.md index 17e2e4260..b0b37f2f5 100644 --- a/toc/working-groups/docs.md +++ b/toc/working-groups/docs.md @@ -75,6 +75,8 @@ areas: github: akop - name: Jovan Kostovski github: chombium + - name: Arsalan Khan + github: asalan316 repositories: - cloudfoundry-tutorials/cf4devs - cloudfoundry-tutorials/korifi-ci