Merge branch 'main' into r9

Author: fkr

config.yaml

@@ -208,6 +208,9 @@ labels:
   - name: "kaas-hackathon"
     description: ""
     color: "0dce67"
+  - name: "hackathon"
+    description: ""
+    color: "8d3ef6"
   # Sprint names
   - name: "Sprint Amsterdam"
     description: "Sprint Amsterdam (2023, cwk 16+17)"

orgs/SovereignCloudStack/data.yaml

@@ -94,7 +94,7 @@ members:
   - name: Toens Bueker
     login: neuroserve
   - name: Oliver Kautz
-    login: o-otte
+    login: okautz
   - name: Sebastian Kaupe
     login: snkaupe
   - name: Roy Farrell
@@ -266,6 +266,10 @@ members:
     login: janhorstmann
   - name: Karsten Samaschke
     login: ksamaschke
+  - name: Vinicius Zavam
+    login: egypcio
+  - name: Marvin Frommhold
+    login: depressiveRobot
 
 # ==========================
 teams:
@@ -338,7 +342,7 @@ teams:
     description: "GONICUS GmbH"
     privacy: closed
     maintainer:
-      - o-otte
+      - okautz
     member:
       - joshmue
       - JoshuaI96
@@ -358,6 +362,7 @@ teams:
     member:
       - BiancaHollery
       - MariusQuabeck
+      - depressiveRobot
   - slug: "osism"
     description: "OSISM GmbH"
     privacy: closed
@@ -401,12 +406,12 @@ teams:
     privacy: closed
     maintainer:
       - jklippel
+      - scoopex
     member:
       - harmathy
       - mauhau
       - belgeron
       - varkeen
-      - scoopex
       - jschoone
       - maxwolfs
   - slug: "univention"
@@ -543,7 +548,7 @@ teams:
     description: "Container Monitoring / IaC / CI / Deployment Automation"
     privacy: closed
     maintainer:
-      - o-otte
+      - okautz
     member:
       - joshmue
       - JoshuaI96
@@ -633,7 +638,7 @@ teams:
     description: "Admins of the Zuul CI System"
     privacy: closed
     maintainer:
-      - o-otte
+      - okautz
       - PixelPhantomX
     member:
       - bitkeks
@@ -660,6 +665,15 @@ teams:
       - garloff
       - jschoone
       - matofeder
+  - slug: "ECO-DIGIT"
+    description: "Colleagues from ECO:DIGIT project"
+    privacy: closed
+    maintainer:
+      - zuse-z3
+    member:
+      - fkr
+      - egypcio
+
 
 # ==========================
 branch_protection_templates:

orgs/SovereignCloudStack/repositories/openstack-workload-generator.yml

@@ -20,6 +20,9 @@ openstack-workload-generator:
   teams:
     - slug: "osba"
       permission: "admin"
+    - slug: "uhurutec"
+      permission: "maintain"
+
   collaborators: []
   branch_protections:
     - branch: "main"