Merge branch 'main' into bosh-prometheus

Author: gberche-orange

org/branchprotection.yml

@@ -110,3 +110,33 @@ branch-protection:
             dismiss_stale_reviews: true
             require_code_owner_reviews: true
             required_approving_review_count: 1
+
+        # App-Autoscaler
+        app-autoscaler-release:
+          protect: true
+          enforce_admins: true
+          allow_force_pushes: false
+          allow_deletions: false
+          allow_disabled_policies: true
+          required_status_checks:
+            contexts:
+            - "EasyCLA"
+            - "Create Bosh Release"
+            - "Acceptance Tests - Broker_Check"
+            - "Build suite=test, mysql=8"
+            - "Build suite=test, postgres=12"
+            - "Build suite=integration, mysql=8"
+            - "Build suite=integration, postgres=12"
+            - "reviewdog"
+            - "Build suite=integration, postgres=15"
+            - "Build suite=test, postgres=15"
+            - "CodeQL"
+          required_pull_request_reviews:
+            dismiss_stale_reviews: true
+            require_code_owner_reviews: true
+            required_approving_review_count: 1
+            bypass_pull_request_allowances:
+              teams: ["wg-app-runtime-interfaces-autoscaler-bots"]
+          include: [ "^main$" ]
+        app-autoscaler-env-bbl-state:
+          protect: false

org/cloudfoundry.yml

@@ -170,7 +170,7 @@ orgs:
       bosh-alicloud-cpi-release:
         description: BOSH Alibaba CPI
         has_projects: true
-        default_branch: main
+        default_branch: master
       bosh-ali-storage-cli:
         description: Go CLI for Alibaba storage
         has_projects: true

toc/working-groups/app-runtime-interfaces.md

@@ -41,8 +41,6 @@ technical_leads:
 - name: Greg Cobb
   github: gerg
 bots:
-- name: App Autoscaler CI Bot
-  github: app-autoscaler-ci-bot
 - name: Cloud Foundry Buildpacks Team Robot
   github: cf-buildpacks-eng
 - name: ARI WG Git Bot
@@ -65,6 +63,9 @@ areas:
   reviewers:
   - name: Sumit Kulhadia
     github: kulhadia
+  bots:
+  - name: App Autoscaler CI Bot
+    github: app-autoscaler-ci-bot
   repositories:
   - cloudfoundry/app-autoscaler-release
   - cloudfoundry/app-autoscaler-cli-plugin

toc/working-groups/foundational-infrastructure.md

@@ -249,12 +249,10 @@ areas:
   - cloudfoundry/bosh-acceptance-tests
   - cloudfoundry/bosh-agent
   - cloudfoundry/bosh-agent-index
-  - cloudfoundry/bosh-alicloud-light-stemcell-builder
   - cloudfoundry/bosh-aws-cpi-release
   - cloudfoundry/bosh-aws-light-stemcell-builder
   - cloudfoundry/bosh-azure-cpi-release
   - cloudfoundry/bosh-azure-storage-cli
-  - cloudfoundry/bosh-ali-storage-cli
   - cloudfoundry/bosh-apt-resources
   - cloudfoundry/bosh-bbl-ci-envs
   - cloudfoundry/bosh-bootloader
@@ -315,7 +313,6 @@ areas:
   - cloudfoundry/sample-windows-bosh-release
   - cloudfoundry/socks5-proxy
   - cloudfoundry/stembuild
-  - cloudfoundry/stemcells-alicloud-index
   - cloudfoundry/usn-resource
   - cloudfoundry/windows-utilities-release
   - cloudfoundry/windows-utilities-tests
@@ -326,6 +323,10 @@ areas:
     github: xiaozhu36
   repositories:
   - cloudfoundry/bosh-alicloud-cpi-release
+  - cloudfoundry/bosh-alicloud-light-stemcell-builder
+  - cloudfoundry/bosh-ali-storage-cli
+  - cloudfoundry/stemcells-alicloud-index
+
 - name: Prometheus (Bosh)
   approvers:
     - name: Benjamin Guttmann
@@ -343,7 +344,6 @@ areas:
     - cloudfoundry/node-exporter-boshrelease
     - cloudfoundry/prometheus-boshrelease
 
-
 config:
   github_project_sync:
     mapping: