Port bug 1490094: [release] Configure staging release resources via dedicated parameter. rs=bustage-fix
authorJorg K <jorgk@jorgk.com>
Wed, 12 Sep 2018 10:52:47 +0200
changeset 33135 21c798a31bdf4833368f791db5fddfb35c8997be
parent 33134 4d4e022e66970521a0962db37b3d07071638a854
child 33136 4658bcf16f8d845be88098294ae34a0029f77ca4
push id387
push userclokep@gmail.com
push dateMon, 10 Dec 2018 21:30:47 +0000
reviewersbustage-fix
bugs1490094
Port bug 1490094: [release] Configure staging release resources via dedicated parameter. rs=bustage-fix
taskcluster/ci/release-balrog-submit-toplevel/kind.yml
taskcluster/ci/release-bouncer-aliases/kind.yml
taskcluster/ci/release-bouncer-sub/kind.yml
taskcluster/ci/release-generate-checksums-beetmover/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-balrog-submit-toplevel/kind.yml
+++ b/taskcluster/ci/release-balrog-submit-toplevel/kind.yml
@@ -11,32 +11,32 @@ transforms:
 
 job-defaults:
     run-on-projects: []  # to make sure this never runs in CI
     shipping-phase: promote
     worker:
         implementation: balrog
         balrog-action: submit-toplevel
         require-mirrors: true
+        archive-domain:
+           by-release-level:
+              production: archive.mozilla.org
+              staging: ftp.stage.mozaws.net
+        download-domain:
+           by-release-level:
+              production: download.mozilla.org
+              staging: bouncer-bouncer-releng.stage.mozaws.net
 
 jobs:
     thunderbird:
         name: submit-toplevel-thunderbird-release-to-balrog
         description: Submit toplevel Thunderbird release to balrog
         shipping-product: thunderbird
         worker:
             product: thunderbird
-            archive-domain:
-                by-project:
-                    comm-(beta|esr.*): archive.mozilla.org
-                    default: ftp.stage.mozaws.net
-            download-domain:
-                by-project:
-                    comm-(beta|esr.*): download.mozilla.org
-                    default: bouncer-bouncer-releng.stage.mozaws.net
             channel-names:
                 by-project:
                     comm-beta: ["beta", "beta-localtest", "beta-cdntest"]
                     comm-esr.*: ["release", "release-localtest", "release-cdntest"]
                     default: []
             publish-rules:
                 by-project:
                     comm-beta: [43]
@@ -56,24 +56,16 @@ jobs:
 
     # FIXME: (Bug 1487172) This task should only run on esr60-like branches
     thunderbird-bz2:
         name: submit-toplevel-thunderbird-release-to-balrog-bz2
         description: Submit toplevel Thunderbird release to balrog (bz2)
         shipping-product: thunderbird
         worker:
             product: thunderbird
-            archive-domain:
-                by-project:
-                    comm-esr60: archive.mozilla.org
-                    default: ftp.stage.mozaws.net
-            download-domain:
-                by-project:
-                    comm-esr60: download.mozilla.org
-                    default: bouncer-bouncer-releng.stage.mozaws.net
             channel-names:
                 by-project:
                     comm-esr60: ["release", "release-localtest", "release-cdntest"]
                     default: []
             publish-rules:
                 by-project:
                     comm-esr60: [516]
                     default: []
--- a/taskcluster/ci/release-bouncer-aliases/kind.yml
+++ b/taskcluster/ci/release-bouncer-aliases/kind.yml
@@ -10,27 +10,27 @@ transforms:
     - taskgraph.transforms.task:transforms
 
 kind-dependencies:
     - release-bouncer-check
 
 job-defaults:
     description: Update bouncer aliases job
     worker-type:
-        by-project:
+        by-release-level:
             comm-(beta|esr.*): scriptworker-prov-v1/tb-bouncer-v1
-            default: scriptworker-prov-v1/tb-bouncer-dev
+            production: scriptworker-prov-v1/tb-bouncer-dev
     worker:
         implementation: bouncer-aliases
     scopes:
-        by-project:
+        by-release-level:
             comm-(beta|esr.*):
                 - project:comm:thunderbird:releng:bouncer:action:aliases
                 - project:comm:thunderbird:releng:bouncer:server:production
-            default:
+            production:
                 - 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
@@ -6,27 +6,27 @@ 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-project:
+        by-release-level:
             comm-(beta|esr.*): scriptworker-prov-v1/tb-bouncer-v1
-            default: scriptworker-prov-v1/tb-bouncer-dev
+            production: scriptworker-prov-v1/tb-bouncer-dev
     worker:
         implementation: bouncer-submission
     scopes:
-        by-project:
+        by-release-level:
             comm-(beta|esr.*):
                 - project:comm:thunderbird:releng:bouncer:action:submission
                 - project:comm:thunderbird:releng:bouncer:server:production
-            default:
+            production:
                 - 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-beetmover/kind.yml
+++ b/taskcluster/ci/release-generate-checksums-beetmover/kind.yml
@@ -8,12 +8,8 @@ transforms:
     - taskgraph.transforms.release_generate_checksums_beetmover:transforms
     - taskgraph.transforms.task:transforms
 
 kind-dependencies:
     - release-generate-checksums-signing
 
 job-template:
     shipping-phase: promote
-    worker-type:
-        by-project:
-            comm-(beta|esr.*): scriptworker-prov-v1/tb-beetmover-v1
-            default: scriptworker-prov-v1/tb-beetmover-dev
--- a/taskcluster/ci/release-generate-checksums/kind.yml
+++ b/taskcluster/ci/release-generate-checksums/kind.yml
@@ -56,17 +56,17 @@ job-defaults:
 jobs:
     thunderbird:
         shipping-product: thunderbird
         attributes:
             build_platform: thunderbird-release
             build_type: opt
         run:
             extra-config:
-                by-project:
+                by-release-level:
                     comm-(beta|esr.*):
                         stage_product: "thunderbird"
                         bucket_name: "net-mozaws-prod-delivery-archive"
-                    default:
+                    production:
                         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
@@ -12,25 +12,25 @@ transforms:
 kind-dependencies:
     - release-balrog-scheduling
     - release-bouncer-aliases
     - release-version-bump
 
 job-defaults:
     description: mark release as shipped in Ship-It
     worker-type:
-        by-project:
+        by-release-level:
             comm-(beta|esr.*): scriptworker-prov-v1/tb-shipit-v1
-            default: scriptworker-prov-v1/tb-shipit-dev
+            production: scriptworker-prov-v1/tb-shipit-dev
     worker:
         implementation: shipit-shipped
     scopes:
-        by-project:
+        by-release-level:
             comm-(beta|esr.*): ['project:comm:thunderbird:releng:ship-it:production']
-            default: ['project:comm:thunderbird:releng:ship-it:staging']
+            production: ['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
@@ -24,27 +24,27 @@ job-defaults:
               type: file
     run:
         using: run-task
         sparse-profile: mozharness
     extra:
         app-name: mail
         branch-prefix: comm
         archive-prefix:
-            by-project:
+            by-release-level:
                 try-comm-central: "http://ftp.stage.mozaws.net/pub"
-                default: "https://archive.mozilla.org/pub"
+                production: "https://archive.mozilla.org/pub"
         previous-archive-prefix:
-            by-project:
+            by-release-level:
                 try-comm-central: "https://archive.mozilla.org/pub"
-                default: null
+                production: null
         aus-server:
-            by-project:
+            by-release-level:
                 try-comm-central: "https://aus5.stage.mozaws.net"
-                default: "https://aus5.mozilla.org"
+                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:
                 comm-beta: beta