Bug 1490094 - Follow-up: fix incorrect release levels. r=me DONTBUILD
authorJorg K <jorgk@jorgk.com>
Thu, 13 Sep 2018 10:14:34 +0200
changeset 33142 e4373d203bcc042f4343015f3dfb3ff5901c5cf5
parent 33141 5db89a74a3cdc2082f8c3615fe714dd165c662d1
child 33143 5237216b5de539afc782736f87772555478d6239
push id387
push userclokep@gmail.com
push dateMon, 10 Dec 2018 21:30:47 +0000
reviewersme
bugs1490094
Bug 1490094 - Follow-up: fix incorrect release levels. r=me DONTBUILD
taskcluster/ci/release-bouncer-aliases/kind.yml
taskcluster/ci/release-bouncer-sub/kind.yml
taskcluster/ci/release-generate-checksums/kind.yml
taskcluster/ci/release-mark-as-shipped/kind.yml
taskcluster/ci/release-update-verify-config/kind.yml
--- a/taskcluster/ci/release-bouncer-aliases/kind.yml
+++ b/taskcluster/ci/release-bouncer-aliases/kind.yml
@@ -11,26 +11,26 @@ transforms:
 
 kind-dependencies:
     - release-bouncer-check
 
 job-defaults:
     description: Update bouncer aliases job
     worker-type:
         by-release-level:
-            comm-(beta|esr.*): scriptworker-prov-v1/tb-bouncer-v1
-            production: scriptworker-prov-v1/tb-bouncer-dev
+            production: scriptworker-prov-v1/tb-bouncer-v1
+            staging: scriptworker-prov-v1/tb-bouncer-dev
     worker:
         implementation: bouncer-aliases
     scopes:
         by-release-level:
-            comm-(beta|esr.*):
+            production:
                 - project:comm:thunderbird:releng:bouncer:action:aliases
                 - project:comm:thunderbird:releng:bouncer:server:production
-            production:
+            staging:
                 - project:comm:thunderbird:releng:bouncer:action:aliases
                 - project:comm:thunderbird:releng:bouncer:server:staging
     run-on-projects: []
     shipping-phase: ship
     treeherder:
         symbol: Rel(BncAlias)
         kind: test
         tier: 1
--- a/taskcluster/ci/release-bouncer-sub/kind.yml
+++ b/taskcluster/ci/release-bouncer-sub/kind.yml
@@ -7,26 +7,26 @@ loader: taskgraph.loader.transform:loade
 transforms:
     - taskgraph.transforms.bouncer_submission:transforms
     - taskgraph.transforms.task:transforms
 
 job-defaults:
     description: release bouncer submission job
     worker-type:
         by-release-level:
-            comm-(beta|esr.*): scriptworker-prov-v1/tb-bouncer-v1
-            production: scriptworker-prov-v1/tb-bouncer-dev
+            production: scriptworker-prov-v1/tb-bouncer-v1
+            staging: scriptworker-prov-v1/tb-bouncer-dev
     worker:
         implementation: bouncer-submission
     scopes:
         by-release-level:
-            comm-(beta|esr.*):
+            production:
                 - project:comm:thunderbird:releng:bouncer:action:submission
                 - project:comm:thunderbird:releng:bouncer:server:production
-            production:
+            staging:
                 - project:comm:thunderbird:releng:bouncer:action:submission
                 - project:comm:thunderbird:releng:bouncer:server:staging
     run-on-projects: []
     shipping-phase: promote
     locales-file: comm/mail/locales/shipped-locales
     treeherder:
         symbol: Rel(BncSub)
         kind: test
--- a/taskcluster/ci/release-generate-checksums/kind.yml
+++ b/taskcluster/ci/release-generate-checksums/kind.yml
@@ -57,16 +57,16 @@ jobs:
     thunderbird:
         shipping-product: thunderbird
         attributes:
             build_platform: thunderbird-release
             build_type: opt
         run:
             extra-config:
                 by-release-level:
-                    comm-(beta|esr.*):
+                    production:
                         stage_product: "thunderbird"
                         bucket_name: "net-mozaws-prod-delivery-archive"
-                    production:
+                    staging:
                         stage_product: "thunderbird"
                         bucket_name: "net-mozaws-stage-delivery-archive"
         treeherder:
             platform: thunderbird-release/opt
--- a/taskcluster/ci/release-mark-as-shipped/kind.yml
+++ b/taskcluster/ci/release-mark-as-shipped/kind.yml
@@ -13,24 +13,24 @@ kind-dependencies:
     - release-balrog-scheduling
     - release-bouncer-aliases
     - release-version-bump
 
 job-defaults:
     description: mark release as shipped in Ship-It
     worker-type:
         by-release-level:
-            comm-(beta|esr.*): scriptworker-prov-v1/tb-shipit-v1
-            production: scriptworker-prov-v1/tb-shipit-dev
+            production: scriptworker-prov-v1/tb-shipit-v1
+            staging: scriptworker-prov-v1/tb-shipit-dev
     worker:
         implementation: shipit-shipped
     scopes:
         by-release-level:
-            comm-(beta|esr.*): ['project:comm:thunderbird:releng:ship-it:production']
-            production: ['project:comm:thunderbird:releng:ship-it:staging']
+            production: ['project:comm:thunderbird:releng:ship-it:production']
+            staging: ['project:comm:thunderbird:releng:ship-it:staging']
     run-on-projects: []
     shipping-phase: ship
 
 jobs:
     thunderbird:
         name: release-thunderbird_mark_as_shipped
         shipping-product: thunderbird
         treeherder:
--- a/taskcluster/ci/release-update-verify-config/kind.yml
+++ b/taskcluster/ci/release-update-verify-config/kind.yml
@@ -25,25 +25,25 @@ job-defaults:
     run:
         using: run-task
         sparse-profile: mozharness
     extra:
         app-name: mail
         branch-prefix: comm
         archive-prefix:
             by-release-level:
-                try-comm-central: "http://ftp.stage.mozaws.net/pub"
+                staging: "http://ftp.stage.mozaws.net/pub"
                 production: "https://archive.mozilla.org/pub"
         previous-archive-prefix:
             by-release-level:
-                try-comm-central: "https://archive.mozilla.org/pub"
+                staging: "https://archive.mozilla.org/pub"
                 production: null
         aus-server:
             by-release-level:
-                try-comm-central: "https://aus5.stage.mozaws.net"
+                staging: "https://aus5.stage.mozaws.net"
                 production: "https://aus5.mozilla.org"
         # This is overridden for devedition to exclude 58.0b1
         # because of the special case added by
         # https://bugzilla.mozilla.org/show_bug.cgi?id=1419189
         # The devedition override can be removed after 58.0b1
         # is behind a watershed
         include-version:
             by-project: