Bug 1290499 - Updates to Recruiting Bug Form

2 files changed, 39 insertions, 65 deletions

diff --git a/extensions/BMO/template/en/default/bug/create/cost-centers.none.tmpl b/extensions/BMO/template/en/default/bug/create/cost-centers.none.tmpl
index 54ff90c7d..73a61f2d7 100644
--- a/extensions/BMO/template/en/default/bug/create/cost-centers.none.tmpl
+++ b/extensions/BMO/template/en/default/bug/create/cost-centers.none.tmpl
@@ -12,6 +12,8 @@
     "1001 - Office of Chair"
     "1002 - Participation"
     "1003 - Office of CIO"
+    "1005 - Corp Consolidation & Elimination"
+    "1006 - Taipei Development Center"
     "1010 - Office of CTO"
     "1011 - Research"
     "1012 - Tech Evangelism"
@@ -31,78 +33,45 @@
     "1350 - Recruiting"
     "1360 - Metrics"
     "1400 - IT and Network"
-    "1500 - General Content Services"
-    "1501 - Engineering"
-    "1502 - Sales"
-    "1503 - Product"
-    "1700 - Strategic Initiative"
-    "2000 - Engagement"
-    "2200 - PR"
-    "2300 - Community Engagement"
-    "2320 - MDN"
+    "1410 - Infrastructure Eng & Ops (Infra)"
+    "1420 - Enterprise Information Security (EIS)"
+    "1430 - End User Services (EUS)"
+    "1440 - Enterprise Applications & Services (EApps)"
+    "2000 - General Marketing"
+    "2200 - Mar Com"
+    "2300 - Lifecycle Marketing"
+    "2320 - Developer Marketing"
     "2400 - Brand Engagement"
-    "2500 - Engagement Websites"
-    "2600 - SUMO"
-    "3000 - Cloud and Services"
-    "3100 - Infrastructure (servers)"
-    "3110 - Production Cloud Infra"
-    "3120 - Development Cloud Infra"
-    "3130 - Production DC Infra"
-    "3210 - Services and Engineering Operations"
-    "3220 - Cloud Services Operation"
-    "3240 - Cloud Services Product and Project Management"
-    "3290 - Identity Services"
+    "2500 - Marketing Operations"
+    "2700 - Product Marketing"
     "5000 - Firefox"
-    "5100 - Firefox Product Marketing"
-    "5200 - Firefox Desktop"
-    "5210 - Firefox Desktop Engineering"
-    "5220 - Firefox Desktop UX"
-    "5230 - Firefox Desktop Product Management"
-    "5250 - Firefox Hello"
-    "5300 - Firefox Mobile"
-    "5310 - Firefox Android Engineering"
-    "5320 - Firefox Android UX"
-    "5330 - Firefox Android Product Management"
-    "5400 - Firefox Dev Tools"
-    "5500 - Firefox iOS"
-    "5600 - Firefox Program Management"
-    "6000 - Mobile"
-    "6110 - Firefox OS Engineering I"
-    "6140 - Firefox OS Automation"
-    "6150 - Firefox OS Engineering Program Management"
+    "5500 - Product Engineering"
+    "5650 - Services Engineering"
+    "5660 - Production Cloud Infrastructure"
+    "5670 - Development Cloud Infrastructure"
+    "5700 - Firefox UX"
+    "5800 - Product Management"
+    "5900 - Program Management"
+    "6000 - Connected Devices"
+    "6110 - Connected Devices Engineering"
+    "6150 - Connected Devices Program Management"
     "6160 - Firefox OS QA"
-    "6200 - Firefox OS Product Management"
-    "6220 - Firefox OS Product Marketing"
+    "6200 - Connected Devices Product Management"
     "6300 - Firefox OS UX"
-    "6500 - Mobile Business Development"
-    "7000 - Mobile Planning and Ecosystem"
-    "7110 - Mobile Partner Engineering"
-    "7120 - Mobile Planning"
-    "7130 - Mobile Apps Engineering"
-    "7150 - Mobile Partners Contents"
-    "7200 - Mobile Ecosystem Program Management"
-    "7220 - Mobile Partner Products"
-    "7500 - Reviews and Community"
+    "6400 - Web App Development"
+    "6500 - Partnerships"
+    "6600 - Product Strategy & Insights"
+    "6650 - Design"
+    "6700 - Connected Devices Business Operations"
+    "6750 - Connected Devices Product/UX"
+    "6800 - Connected Devices Collaboration"
     "8000 - Engineering Platform"
-    "8100 - Release Engineering"
-    "8300 - Engineering Operations"
-    "8400 - Platform PKI"
-    "8410 - Platform Network"
-    "8420 - Platform Security"
-    "8430 - Platform Fuzzing"
-    "8440 - Platform DOM"
-    "8450 - Platform Rendering, Media and Graphics"
-    "8460 - Platform Android"
-    "8470 - Platform WebRTC"
-    "8480 - Platform e10s"
-    "8490 - Platform Accessibility"
-    "8510 - Platform QE"
-    "8600 - Engineering Productivity"
-    "8700 - JavaScript"
+    "8200 - Platform Operations"
     "8750 - Localization (l10n)"
+    "8800 - Product Management"
+    "8900 - Platform Engineering"
     "900 - Mozilla Foundation"
     "901 - MoFo NSF"
-    "9999 - Moz Taiwan"
   ];
 
   # the above list is in a format that mirrors the output we get from our financial system
diff --git a/extensions/BMO/template/en/default/bug/create/vp-authority.html.tmpl b/extensions/BMO/template/en/default/bug/create/vp-authority.html.tmpl
index e0e5f5afd..959c39314 100644
--- a/extensions/BMO/template/en/default/bug/create/vp-authority.html.tmpl
+++ b/extensions/BMO/template/en/default/bug/create/vp-authority.html.tmpl
@@ -9,13 +9,18 @@
 <option value="Alex Salkever">Alex Salkever</option>
 <option value="Allison Banks">Allison Banks</option>
 <option value="Ari Jaaski">Ari Jaaski</option>
+<option value="Chris Beard">Chris Beard</option>
 <option value="David Bryant">David Bryant</option>
 <option value="David Slater">David Slater</option>
 <option value="Denelle Dixon-Thayer">Denelle Dixon-Thayer</option>
+<option value="EKR">EKR</option>
 <option value="Jascha Kaykas-Wolff">Jascha Kaykas-Wolff</option>
 <option value="Jim Cook">Jim Cook</option>
 <option value="Katharina Borchert">Katharina Borchert</option>
 <option value="Mark Mayo">Mark Mayo</option>
 <option value="Mary Ellen Muckerman">Mary Ellen Muckerman</option>
+<option value="Mitchell Baker">Mitchell Baker</option>
 <option value="Nick Nguyen">Nick Nguyen</option>
-<option value="Sylvie Veillieux">Sylvie Veillieux</option>
+<option value="Sean White">Sean White</option>
+<option value="Susan Chen">Susan Chen</option>
+<option value="Sylvie Veilleux">Sylvie Veilleux</option>