Merge branch 'update-configure-orchestration-titles' into 'master'

Convert Orchestration job titles to include group, fix handbook page

See merge request gitlab-com/www-gitlab-com!35462

data/team.yml

@@ -6334,7 +6334,7 @@
   placeholder: true
   locality: Anywhere
   country: Remote
-  role: <a href="/job-families/engineering/backend-engineer/#engineering-manager">Engineering Manager, Configure Orchestration</a>
+  role: <a href="/job-families/engineering/backend-engineer/#engineering-manager">Engineering Manager, Configure:Orchestration</a>
   reports_to: director-of-engineering-ops
   picture: ../gitlab-logo-extra-whitespace.png
   twitter:
@@ -6343,7 +6343,7 @@
     - Engineering Function
     - Development Department
     - Ops Section
-    - Configure BE Team
+    - Configure:Orchestration BE Team
   story:  |
           Open Position
@@ -11097,7 +11097,7 @@
   location_factor: 0.5201
   locality: Wellington
   country: New Zealand
-  role: <a href="/job-families/engineering/backend-engineer/">Senior Backend Engineer, Configure</a>
+  role: <a href="/job-families/engineering/backend-engineer/">Senior Backend Engineer, Configure:Orchestration</a>
   reports_to: configure-orchestration-engineering-manager
   picture: thongkuah.jpg
   twitter: thongkuah
@@ -11106,7 +11106,7 @@
     - Engineering Function
     - Development Department
     - Ops Section
-    - Configure BE Team
+    - Configure:Orchestration BE Team
   projects:
     gitlab: maintainer backend
     charts-auto-deploy-app: maintainer
@@ -11136,7 +11136,7 @@
   location_factor: 0.5201
   locality: Wellington
   country: New Zealand
-  role: <a href="/job-families/engineering/backend-engineer/">Senior Backend Engineer, Configure</a>
+  role: <a href="/job-families/engineering/backend-engineer/">Senior Backend Engineer, Configure:Orchestration</a>
   reports_to: configure-orchestration-engineering-manager
   picture: jamesfargher.png
   twitter: proglottis
@@ -11145,7 +11145,7 @@
     - Engineering Function
     - Development Department
     - Ops Section
-    - Configure BE Team
+    - Configure:Orchestration BE Team
   projects:
     gitlab:
       - trainee_maintainer backend
@@ -11160,7 +11160,7 @@
   location_factor: 0.611
   locality: Reykjavik
   country: Iceland
-  role: <a href="/job-families/engineering/backend-engineer/">Backend Engineer, Configure</a>
+  role: <a href="/job-families/engineering/backend-engineer/">Backend Engineer, Configure:Orchestration</a>
   reports_to: configure-orchestration-engineering-manager
   picture: hordurfreyryngvason.jpg
   twitter: vindvaki
@@ -11169,7 +11169,7 @@
     - Engineering Function
     - Development Department
     - Ops Section
-    - Configure BE Team
+    - Configure:Orchestration BE Team
   projects:
     gitlab: reviewer backend
   story: |
@@ -11186,7 +11186,7 @@
   location_factor: 0.55
   locality: Berlin
   country: Germany
-  role: <a href="/job-families/engineering/backend-engineer/">Backend Engineer, Configure</a>
+  role: <a href="/job-families/engineering/backend-engineer/">Backend Engineer, Configure:Orchestration</a>
   reports_to: configure-orchestration-engineering-manager
   picture: joaocunha.jpg
   twitter:
@@ -11195,7 +11195,7 @@
     - Engineering Function
     - Development Department
     - Ops Section
-    - Configure BE Team
+    - Configure:Orchestration BE Team
   projects:
     gitlab: reviewer backend
     charts-auto-deploy-app: reviewer
@@ -11209,7 +11209,7 @@
   location_factor: 0.5456
   locality: Melbourne
   country: Australia
-  role: <a href="/job-families/engineering/backend-engineer/">Senior Backend Engineer, Configure</a>
+  role: <a href="/job-families/engineering/backend-engineer/">Senior Backend Engineer, Configure:Orchestration</a>
   reports_to: configure-orchestration-engineering-manager
   picture: tigerwatson.jpg
   twitter:
@@ -11218,7 +11218,7 @@
     - Engineering Function
     - Development Department
     - Ops Section
-    - Configure BE Team
+    - Configure:Orchestration BE Team
   projects:
     gitlab:
       - reviewer backend

source/handbook/engineering/development/ops/configure/orchestration/index.html.md.erb

@@ -44,7 +44,7 @@ work as possible back to the open source community.
 ### Backend Team
-<%= direct_team(manager_role: 'Engineering Manager, Configure Orchestration') %>
+<%= direct_team(manager_role: 'Engineering Manager, Configure:Orchestration') %>
 ### Frontend Team
@@ -54,7 +54,7 @@ work as possible back to the open source community.
 The following members of other functional teams are our stable counterparts:
-<%= stable_counterparts(role_regexp: /[,&] Configure/, direct_manager_role: 'Engineering Manager, Configure Orchestration') %>
+<%= stable_counterparts(role_regexp: /[,&] Configure/, direct_manager_role: 'Engineering Manager, Configure:Orchestration', other_manager_roles: ['Frontend Engineering Manager, Configure', 'Engineering Manager, Configure:System']) %>
 ## Common Links