Backed out changeset dd29466819f2 (bug 1542550) for suspected decision task bustage. a=backout
authorJorg K <jorgk@jorgk.com>
Mon, 06 May 2019 00:13:09 +0200
changeset 32809 d9ee35b18a0da38d841b255a895e42a8453b355a
parent 32808 dd29466819f2175b150607a1e38667bd7668cc71
child 32810 d9dfeb170a29f6db25fdd16a3257088756a7b136
push idunknown
push userunknown
push dateunknown
reviewersbackout
bugs1542550
backs outdd29466819f2175b150607a1e38667bd7668cc71
Backed out changeset dd29466819f2 (bug 1542550) for suspected decision task bustage. a=backout
.cron.yml
taskcluster/ci/balrog/kind.yml
taskcluster/ci/beetmover-checksums/kind.yml
taskcluster/ci/beetmover-l10n/kind.yml
taskcluster/ci/beetmover-repackage/kind.yml
taskcluster/ci/build/linux.yml
taskcluster/ci/build/macosx.yml
taskcluster/ci/build/windows.yml
taskcluster/ci/checksums-signing/kind.yml
taskcluster/ci/mar-signing-l10n/kind.yml
taskcluster/ci/mar-signing/kind.yml
taskcluster/ci/nightly-l10n-signing/kind.yml
taskcluster/ci/nightly-l10n/kind.yml
taskcluster/ci/release-update-verify-config/kind.yml
taskcluster/ci/release-update-verify/kind.yml
taskcluster/ci/repackage-l10n/kind.yml
taskcluster/ci/repackage-msi/kind.yml
taskcluster/ci/repackage-signing-l10n/kind.yml
taskcluster/ci/repackage-signing-msi/kind.yml
taskcluster/ci/repackage-signing/kind.yml
taskcluster/ci/repackage/kind.yml
taskcluster/ci/test/test-platforms.yml
taskcluster/ci/upload-symbols/kind.yml
--- a/.cron.yml
+++ b/.cron.yml
@@ -5,61 +5,56 @@
 ---
 
 jobs:
     - name: nightly-desktop
       job:
           type: decision-task
           treeherder-symbol: Nd
           target-tasks-method: nightly_desktop
-          include-push-tasks: true
       run-on-projects:
           - comm-central
       when:
           by-project:
               # Match buildbot starts for now
               comm-central: [{hour: 10, minute: 0}]
               # No default
 
     - name: nightly-linux
       job:
           type: decision-task
           treeherder-symbol: Nd-Ln
           target-tasks-method: nightly_linux
-          include-push-tasks: true
       run-on-projects:
           - comm-central
       when: []  # never (hook only)
 
     - name: nightly-osx
       job:
           type: decision-task
           treeherder-symbol: Nd-OSX
           target-tasks-method: nightly_macosx
-          include-push-tasks: true
       run-on-projects:
           - comm-central
       when: []  # never (hook only)
 
     - name: nightly-win32
       job:
           type: decision-task
           treeherder-symbol: Nd-win32
           target-tasks-method: nightly_win32
-          include-push-tasks: true
       run-on-projects:
           - comm-central
       when: []  # never (hook only)
 
     - name: nightly-win64
       job:
           type: decision-task
           treeherder-symbol: Nd-win64
           target-tasks-method: nightly_win64
-          include-push-tasks: true
       run-on-projects:
           - comm-central
       when: []  # never (hook only)
 
     - name: periodic-update
       job:
           type: decision-task
           treeherder-symbol: Nfile
--- a/taskcluster/ci/balrog/kind.yml
+++ b/taskcluster/ci/balrog/kind.yml
@@ -11,9 +11,9 @@ transforms:
     - taskgraph.transforms.task:transforms
 
 kind-dependencies:
     - beetmover-l10n
     - beetmover-repackage
 
 only-for-attributes:
     - nightly
-    - shippable
+    - signed
--- a/taskcluster/ci/beetmover-checksums/kind.yml
+++ b/taskcluster/ci/beetmover-checksums/kind.yml
@@ -9,14 +9,13 @@ transforms:
     - taskgraph.transforms.beetmover_checksums:transforms
     - taskgraph.transforms.task:transforms
 
 kind-dependencies:
     - checksums-signing
 
 only-for-attributes:
     - nightly
-    - shippable
 
 job-template:
     shipping-phase: promote
     attributes:
         artifact_prefix: public
--- a/taskcluster/ci/beetmover-l10n/kind.yml
+++ b/taskcluster/ci/beetmover-l10n/kind.yml
@@ -13,13 +13,13 @@ transforms:
 
 kind-dependencies:
     - nightly-l10n-signing
 
 only-for-attributes:
     - nightly
 
 not-for-build-platforms:
-    - linux-shippable/opt
-    - linux64-shippable/opt
-    - macosx64-shippable/opt
-    - win32-shippable/opt
-    - win64-shippable/opt
+    - linux-nightly/opt
+    - linux64-nightly/opt
+    - macosx64-nightly/opt
+    - win32-nightly/opt
+    - win64-nightly/opt
--- a/taskcluster/ci/beetmover-repackage/kind.yml
+++ b/taskcluster/ci/beetmover-repackage/kind.yml
@@ -27,16 +27,16 @@ kind-dependencies:
     - mar-signing
     - mar-signing-l10n
 
 primary-dependency:
     - repackage
     - repackage-l10n
 
 only-for-build-platforms:
-    - linux-shippable/opt
-    - linux64-shippable/opt
-    - macosx64-shippable/opt
-    - win32-shippable/opt
-    - win64-shippable/opt
+    - linux-nightly/opt
+    - linux64-nightly/opt
+    - macosx64-nightly/opt
+    - win32-nightly/opt
+    - win64-nightly/opt
 
 job-template:
     shipping-phase: promote
--- a/taskcluster/ci/build/linux.yml
+++ b/taskcluster/ci/build/linux.yml
@@ -25,30 +25,30 @@ linux64/opt:
         - linux64-binutils
         - linux64-cbindgen
         - linux64-clang
         - linux64-nasm
         - linux64-node
         - linux64-rust
         - linux64-sccache
 
-linux64-shippable/opt:
-    description: "Linux64 Shippable"
+linux64-nightly/opt:
+    description: "Linux64 Nightly"
     attributes:
-        shippable: true
+        nightly: true
         enable-full-crashsymbols: true
     shipping-phase: build
     shipping-product: thunderbird
     index:
         product: thunderbird
         job-name: linux64-opt
-        type: shippable
+        type: nightly
     treeherder:
-        platform: linux64-shippable/opt
-        symbol: B
+        platform: linux64/opt
+        symbol: N
     worker-type: b-linux
     worker:
         docker-image: {in-tree: "debian7-amd64-build"}
         max-run-time: 36000
     run:
         using: mozharness
         comm-checkout: true
         actions: [build, check-test]
@@ -129,30 +129,30 @@ linux/opt:
         - linux64-binutils
         - linux64-cbindgen
         - linux64-clang
         - linux64-nasm
         - linux64-node
         - linux64-rust
         - linux64-sccache
 
-linux-shippable/opt:
-    description: "Linux32 Shippable"
+linux-nightly/opt:
+    description: "Linux32 Nightly"
     attributes:
-        shippable: true
+        nightly: true
         enable-full-crashsymbols: true
     shipping-phase: build
     shipping-product: thunderbird
     index:
         product: thunderbird
         job-name: linux32-opt
-        type: shippable
+        type: nightly
     treeherder:
-        platform: linux32-shippable/opt
-        symbol: B
+        platform: linux32/opt
+        symbol: N
     worker-type: b-linux
     worker:
         docker-image: {in-tree: "debian7-i386-build"}
         max-run-time: 36000
     run:
         using: mozharness
         comm-checkout: true
         actions: [build, check-test]
--- a/taskcluster/ci/build/macosx.yml
+++ b/taskcluster/ci/build/macosx.yml
@@ -73,30 +73,30 @@ macosx64/opt:
         - linux64-hfsplus
         - linux64-libdmg
         - linux64-llvm-dsymutil
         - linux64-nasm
         - linux64-node
         - linux64-rust-macos
         - linux64-sccache
 
-macosx64-shippable/opt:
-    description: "MacOS X x64 Cross-compile"
+macosx64-nightly/opt:
+    description: "MacOS X x64 Cross-compile Nightly"
     attributes:
-        shippable: true
+        nightly: true
         enable-full-crashsymbols: true
     shipping-phase: build
     shipping-product: thunderbird
     index:
         product: thunderbird
         job-name: macosx64-opt
-        type: shippable
+        type: nightly
     treeherder:
-        platform: osx-shippable/opt
-        symbol: B
+        platform: osx-cross/opt
+        symbol: N
         tier: 1
     worker-type: b-linux
     worker:
         max-run-time: 36000
         env:
             # We just use the browser manifest, since we don't need anything different
             TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/macosx64/cross-releng.manifest"
     run:
--- a/taskcluster/ci/build/windows.yml
+++ b/taskcluster/ci/build/windows.yml
@@ -33,34 +33,34 @@ win32/opt:
     toolchains:
         - win64-cbindgen
         - win64-clang-cl
         - win64-nasm
         - win64-node
         - win64-rust
         - win64-sccache
 
-win32-shippable/opt:
-    description: "Win32 Opt Shippable"
+win32-nightly/opt:
+    description: "Win32 Nightly"
+    attributes:
+        nightly: true
+        enable-full-crashsymbols: true
+    shipping-phase: build
+    shipping-product: thunderbird
     index:
         product: thunderbird
         job-name: win32-opt
-        type: shippable
-    attributes:
-        shippable: true
-        enable-full-crashsymbols: true
-    shipping-phase: build
-    shipping-product: thunderbird
+        type: nightly
     treeherder:
-        platform: windows2012-32-shippable/opt
-        symbol: B
+        platform: windows2012-32/opt
+        symbol: N
         tier: 1
     worker-type: b-win2012
     worker:
-        max-run-time: 10800
+        max-run-time: 7200
         env:
             TOOLTOOL_MANIFEST: "comm/mail/config/tooltool-manifests/win32/releng.manifest"
     run:
         actions: [build, check-test]
         options: [append-env-variables-from-configs]
         script: mozharness/scripts/fx_desktop_build.py
         config:
             - builds/taskcluster_base_thunderbird.py
@@ -135,34 +135,34 @@ win64/opt:
     toolchains:
         - win64-cbindgen
         - win64-clang-cl
         - win64-nasm
         - win64-node
         - win64-rust
         - win64-sccache
 
-win64-shippable/opt:
-    description: "Win64 Opt Shippable"
+win64-nightly/opt:
+    description: "Win64 Nightly"
+    attributes:
+        nightly: true
+        enable-full-crashsymbols: true
+    shipping-phase: build
+    shipping-product: thunderbird
     index:
         product: thunderbird
         job-name: win64-opt
-        type: shippable
-    attributes:
-        shippable: true
-        enable-full-crashsymbols: true
-    shipping-phase: build
-    shipping-product: thunderbird
+        type: nightly
     treeherder:
-        platform: windows2012-64-shippable/opt
-        symbol: B
+        platform: windows2012-64/opt
+        symbol: N
         tier: 1
     worker-type: b-win2012
     worker:
-        max-run-time: 10800
+        max-run-time: 7200
         env:
             TOOLTOOL_MANIFEST: "comm/mail/config/tooltool-manifests/win64/releng.manifest"
     run:
         actions: [build, check-test]
         options: [append-env-variables-from-configs]
         script: mozharness/scripts/fx_desktop_build.py
         config:
             - builds/taskcluster_base_thunderbird.py
--- a/taskcluster/ci/checksums-signing/kind.yml
+++ b/taskcluster/ci/checksums-signing/kind.yml
@@ -10,9 +10,8 @@ transforms:
     - taskgraph.transforms.task:transforms
 
 kind-dependencies:
     - beetmover-l10n
     - beetmover-repackage
 
 only-for-attributes:
     - nightly
-    - shippable
--- a/taskcluster/ci/mar-signing-l10n/kind.yml
+++ b/taskcluster/ci/mar-signing-l10n/kind.yml
@@ -8,20 +8,20 @@ transforms:
     - taskgraph.transforms.name_sanity:transforms
     - taskgraph.transforms.mar_signing:transforms
     - taskgraph.transforms.task:transforms
 
 kind-dependencies:
     - repackage-l10n
 
 only-for-build-platforms:
-    - linux-shippable/opt
-    - linux64-shippable/opt
-    - macosx64-shippable/opt
-    - win32-shippable/opt
-    - win64-shippable/opt
+    - linux-nightly/opt
+    - linux64-nightly/opt
+    - macosx64-nightly/opt
+    - win32-nightly/opt
+    - win64-nightly/opt
 
 job-template:
     shipping-phase: promote
     treeherder-group: ms
     description-suffix: 'mar signing'
     required_signoffs:
         - mar-signing
--- a/taskcluster/ci/mar-signing/kind.yml
+++ b/taskcluster/ci/mar-signing/kind.yml
@@ -8,20 +8,20 @@ transforms:
     - taskgraph.transforms.name_sanity:transforms
     - taskgraph.transforms.mar_signing:transforms
     - taskgraph.transforms.task:transforms
 
 kind-dependencies:
     - repackage
 
 only-for-build-platforms:
-    - linux-shippable/opt
-    - linux64-shippable/opt
-    - macosx64-shippable/opt
-    - win32-shippable/opt
-    - win64-shippable/opt
+    - linux-nightly/opt
+    - linux64-nightly/opt
+    - macosx64-nightly/opt
+    - win32-nightly/opt
+    - win64-nightly/opt
 
 job-template:
     shipping-phase: promote
     treeherder-group: ms
     description-suffix: 'mar signing'
     required_signoffs:
         - mar-signing
--- a/taskcluster/ci/nightly-l10n-signing/kind.yml
+++ b/taskcluster/ci/nightly-l10n-signing/kind.yml
@@ -11,9 +11,8 @@ transforms:
     - taskgraph.transforms.task:transforms
     - comm_taskgraph:remove_widevine_and_stub_installer
 
 kind-dependencies:
     - nightly-l10n
 
 only-for-attributes:
     - nightly
-    - shippable
--- a/taskcluster/ci/nightly-l10n/kind.yml
+++ b/taskcluster/ci/nightly-l10n/kind.yml
@@ -16,21 +16,21 @@ kind-dependencies:
     - build
     - build-signing
     - repackage
     - toolchain
 
 primary-dependency: build
 
 only-for-build-platforms:
-    - linux64-shippable/opt
-    - linux-shippable/opt
-    - macosx64-shippable/opt
-    - win32-shippable/opt
-    - win64-shippable/opt
+    - linux64-nightly/opt
+    - linux-nightly/opt
+    - macosx64-nightly/opt
+    - win32-nightly/opt
+    - win64-nightly/opt
 
 job-template:
     description: Localization
     locales-file: comm/mail/locales/l10n-changesets.json
     locales-per-chunk: 5
     run-on-projects: ['release']
     attributes:
         shipping_phase: promote
@@ -45,88 +45,80 @@ job-template:
     toolchains:
         by-build-platform:
             default: []
             macosx64.*:
                 - linux64-libdmg
                 - linux64-hfsplus
     tooltool:
         by-build-platform:
-            default: internal
-            linux.*: public
-    index:
-        type: shippable-l10n
-        product: thunderbird
-        job-name:
-            by-build-platform:
-                linux-shippable: linux-opt
-                linux64-shippable: linux64-opt
-                macosx64-shippable: macosx64-opt
-                win32-shippable: win32-opt
-                win64-shippable: win64-opt
+            default: public
+            macosx64-nightly: internal
+            win32-nightly: internal
+            win64-nightly: internal
     worker-type:
         by-build-platform:
             default: b-linux
             win.*: b-win2012
     treeherder:
         symbol: L10n(N)
         tier: 1
         platform:
             by-build-platform:
-                linux64-shippable: linux64-shippable/opt
-                linux-shippable: linux32-shippable/opt
-                macosx64-shippable: osx-shippable/opt
-                win32-shippable: windows2012-32-shippable/opt
-                win64-shippable: windows2012-64-shippable/opt
+                linux64-nightly: linux64/opt
+                linux-nightly: linux32/opt
+                macosx64-nightly: osx-cross/opt
+                win32-nightly: windows2012-32/opt
+                win64-nightly: windows2012-64/opt
     env:
         by-build-platform:
             linux.*:   # linux64 and 32 get same treatment here
                 EN_US_PACKAGE_NAME: target.tar.bz2
                 EN_US_BINARY_URL:
                     artifact-reference: <build-signing/{artifact_prefix}>
-            macosx64.*:
+            macosx64-nightly:
                 EN_US_PACKAGE_NAME: target.dmg
                 EN_US_BINARY_URL:
                     artifact-reference: <repackage/{artifact_prefix}>
             win.*:
                 EN_US_PACKAGE_NAME: target.zip
                 EN_US_BINARY_URL:
                     artifact-reference: <build-signing/{artifact_prefix}>
     mozharness:
         comm-checkout: true
         config-paths:
             - comm/mozharness
         config:
             # no default, so we fail on new entries
             by-build-platform:
-                linux-shippable:
+                linux-nightly:
                     - single_locale/linux32.py
                     - single_locale/tc_common.py
                     - single_locale/tc_linux_common.py
                     - single_locale/thunderbird.py
                     - taskcluster_nightly.py
-                linux64-shippable:
+                linux64-nightly:
                     - single_locale/linux64.py
                     - single_locale/tc_common.py
                     - single_locale/tc_linux_common.py
                     - single_locale/thunderbird.py
                     - taskcluster_nightly.py
-                macosx64-shippable:
+                macosx64-nightly:
                     - single_locale/macosx64.py
                     - single_locale/tc_common.py
                     - single_locale/tc_macosx64.py
                     - single_locale/thunderbird.py
                     - taskcluster_nightly.py
-                win32-shippable:
+                win32-nightly:
                     - single_locale/win32.py
                     - single_locale/tc_common.py
                     - single_locale/tc_win32.py
                     - single_locale/thunderbird.py
                     - taskcluster_nightly.py
-                win64-shippable:
+                win64-nightly:
                     - single_locale/win64.py
                     - single_locale/tc_common.py
                     - single_locale/tc_win64.py
                     - single_locale/thunderbird.py
                     - taskcluster_nightly.py
         actions: ['clone-locales', 'list-locales', 'setup', 'repack',
                   'summary']
         script: mozharness/scripts/desktop_l10n.py
--- a/taskcluster/ci/release-update-verify-config/kind.yml
+++ b/taskcluster/ci/release-update-verify-config/kind.yml
@@ -65,17 +65,17 @@ jobs:
     thunderbird-linux:
         shipping-product: thunderbird
         treeherder:
             symbol: UVC
             platform: linux32/opt
             kind: test
             tier: 1
         attributes:
-            build_platform: linux-shippable
+            build_platform: linux-nightly
         extra:
             product: thunderbird
             platform: linux-i686
             updater-platform: linux-x86_64
             channel:
                 by-release-type:
                     beta: "beta-localtest"
                     release: "release-localtest"
@@ -88,17 +88,17 @@ jobs:
     thunderbird-linux64:
         shipping-product: thunderbird
         treeherder:
             symbol: UVC
             platform: linux64/opt
             kind: test
             tier: 1
         attributes:
-            build_platform: linux64-shippable
+            build_platform: linux64-nightly
         extra:
             product: thunderbird
             platform: linux-x86_64
             updater-platform: linux-x86_64
             channel:
                 by-release-type:
                     beta: "beta-localtest"
                     release: "release-localtest"
@@ -111,17 +111,17 @@ jobs:
     thunderbird-macosx64:
         shipping-product: thunderbird
         treeherder:
             symbol: UVC
             platform: osx-cross/opt
             kind: test
             tier: 1
         attributes:
-            build_platform: macosx64-shippable
+            build_platform: macosx64-nightly
         extra:
             product: thunderbird
             platform: mac
             updater-platform: linux-x86_64
             channel:
                 by-release-type:
                     beta: "beta-localtest"
                     release: "release-localtest"
@@ -134,17 +134,17 @@ jobs:
     thunderbird-win32:
         shipping-product: thunderbird
         treeherder:
             symbol: UVC
             platform: windows2012-32/opt
             kind: test
             tier: 1
         attributes:
-            build_platform: win32-shippable
+            build_platform: win32-nightly
         extra:
             product: thunderbird
             platform: win32
             updater-platform: linux-x86_64
             channel:
                 by-release-type:
                     beta: "beta-localtest"
                     release: "release-localtest"
@@ -157,17 +157,17 @@ jobs:
     thunderbird-win64:
         shipping-product: thunderbird
         treeherder:
             symbol: UVC
             platform: windows2012-64/opt
             kind: test
             tier: 1
         attributes:
-            build_platform: win64-shippable
+            build_platform: win64-nightly
         extra:
             product: thunderbird
             platform: win64
             updater-platform: linux-x86_64
             channel:
                 by-release-type:
                     beta: "beta-localtest"
                     release: "release-localtest"
--- a/taskcluster/ci/release-update-verify/kind.yml
+++ b/taskcluster/ci/release-update-verify/kind.yml
@@ -46,53 +46,53 @@ jobs:
         description: linux64 update verify
         shipping-product: thunderbird
         treeherder:
             symbol: UV(UV)
             platform: linux64/opt
             kind: test
             tier: 1
         attributes:
-            build_platform: linux64-shippable
+            build_platform: linux64-nightly
 
     thunderbird-linux:
         description: linux update verify
         shipping-product: thunderbird
         treeherder:
             symbol: UV(UV)
             platform: linux32/opt
             kind: test
             tier: 1
         attributes:
-            build_platform: linux-shippable
+            build_platform: linux-nightly
 
     thunderbird-win64:
         description: win64 update verify
         shipping-product: thunderbird
         treeherder:
             symbol: UV(UV)
             platform: windows2012-64/opt
             kind: test
             tier: 1
         attributes:
-            build_platform: win64-shippable
+            build_platform: win64-nightly
 
     thunderbird-win32:
         description: win32 update verify
         shipping-product: thunderbird
         treeherder:
             symbol: UV(UV)
             platform: windows2012-32/opt
             kind: test
             tier: 1
         attributes:
-            build_platform: win32-shippable
+            build_platform: win32-nightly
 
     thunderbird-macosx64:
         description: macosx64 update verify
         shipping-product: thunderbird
         treeherder:
             symbol: UV(UV)
             platform: osx-cross/opt
             kind: test
             tier: 1
         attributes:
-            build_platform: macosx64-shippable
+            build_platform: macosx64-nightly
--- a/taskcluster/ci/repackage-l10n/kind.yml
+++ b/taskcluster/ci/repackage-l10n/kind.yml
@@ -13,21 +13,21 @@ transforms:
     - taskgraph.transforms.task:transforms
     - comm_taskgraph:remove_widevine_and_stub_installer
 
 kind-dependencies:
     - nightly-l10n-signing
     - toolchain
 
 only-for-build-platforms:
-    - linux-shippable/opt
-    - linux64-shippable/opt
-    - macosx64-shippable/opt
-    - win32-shippable/opt
-    - win64-shippable/opt
+    - linux-nightly/opt
+    - linux64-nightly/opt
+    - macosx64-nightly/opt
+    - win32-nightly/opt
+    - win64-nightly/opt
 
 job-template:
     mozharness:
         comm-checkout: true
         config-paths:
             - comm/mozharness
         config:
             by-build-platform:
--- a/taskcluster/ci/repackage-msi/kind.yml
+++ b/taskcluster/ci/repackage-msi/kind.yml
@@ -12,18 +12,18 @@ transforms:
     - taskgraph.transforms.task:transforms
 
 kind-dependencies:
     - repackage-signing
     - repackage-signing-l10n
     - fetch
 
 only-for-build-platforms:
-    - win32-shippable/opt
-    - win64-shippable/opt
+    - win32-nightly/opt
+    - win64-nightly/opt
 
 job-template:
     mozharness:
         comm-checkout: true
         config-paths:
             - comm/mozharness
         config:
             by-build-platform:
--- a/taskcluster/ci/repackage-signing-l10n/kind.yml
+++ b/taskcluster/ci/repackage-signing-l10n/kind.yml
@@ -10,10 +10,10 @@ transforms:
     - taskgraph.transforms.task:transforms
     - comm_taskgraph:remove_widevine_and_stub_installer
 
 
 kind-dependencies:
     - repackage-l10n
 
 only-for-build-platforms:
-    - win32-shippable/opt
-    - win64-shippable/opt
+    - win32-nightly/opt
+    - win64-nightly/opt
--- a/taskcluster/ci/repackage-signing-msi/kind.yml
+++ b/taskcluster/ci/repackage-signing-msi/kind.yml
@@ -8,12 +8,12 @@ transforms:
     - taskgraph.transforms.name_sanity:transforms
     - taskgraph.transforms.repackage_signing:transforms
     - taskgraph.transforms.task:transforms
 
 kind-dependencies:
     - repackage-msi
 
 only-for-build-platforms:
-    - win32-shippable/opt
+    - win32-nightly/opt
     - win32/opt
-    - win64-shippable/opt
+    - win64-nightly/opt
     - win64/opt
--- a/taskcluster/ci/repackage-signing/kind.yml
+++ b/taskcluster/ci/repackage-signing/kind.yml
@@ -10,10 +10,10 @@ transforms:
     - taskgraph.transforms.task:transforms
     - comm_taskgraph:remove_widevine_and_stub_installer
 
 
 kind-dependencies:
     - repackage
 
 only-for-build-platforms:
-    - win32-shippable/opt
-    - win64-shippable/opt
+    - win32-nightly/opt
+    - win64-nightly/opt
--- a/taskcluster/ci/repackage/kind.yml
+++ b/taskcluster/ci/repackage/kind.yml
@@ -12,21 +12,21 @@ transforms:
     - taskgraph.transforms.task:transforms
     - comm_taskgraph:remove_widevine_and_stub_installer
 
 kind-dependencies:
     - build-signing
     - toolchain
 
 only-for-build-platforms:
-    - linux-shippable/opt
-    - linux64-shippable/opt
-    - macosx64-shippable/opt
-    - win32-shippable/opt
-    - win64-shippable/opt
+    - linux-nightly/opt
+    - linux64-nightly/opt
+    - macosx64-nightly/opt
+    - win32-nightly/opt
+    - win64-nightly/opt
 
 job-template:
     mozharness:
         comm-checkout: true
         config-paths:
             - comm/mozharness
         config:
             by-build-platform:
--- a/taskcluster/ci/test/test-platforms.yml
+++ b/taskcluster/ci/test/test-platforms.yml
@@ -15,29 +15,35 @@
 # Linux platforms (matching /linux.*/)
 
 linux64/opt:
     build-platform: linux64/opt
     test-sets:
         - common-tests
         - optimized-tests
 
-linux64-shippable/opt:
-    build-platform: linux64-shippable/opt
+linux64-nightly/opt:
+    build-platform: linux64-nightly/opt
     test-sets:
         - common-tests
         - optimized-tests
 
 linux64/debug:
     build-platform: linux64/debug
     test-sets:
         - common-tests
 
-linux32-shippable/opt:
-    build-platform: linux-shippable/opt
+linux32/opt:
+    build-platform: linux/opt
+    test-sets:
+        - common-tests
+        - optimized-tests
+
+linux32-nightly/opt:
+    build-platform: linux-nightly/opt
     test-sets:
         - common-tests
         - optimized-tests
 
 linux32/debug:
     build-platform: linux/debug
     test-sets:
         - common-tests
@@ -46,49 +52,55 @@ linux32/debug:
 
 # win32
 windows7-32/opt:
     build-platform: win32/opt
     test-sets:
         - common-tests
         - optimized-tests
 
-windows7-32-shippable/opt:
-    build-platform: win32-shippable/opt
+windows7-32-nightly/opt:
+    build-platform: win32-nightly/opt
     test-sets:
         - common-tests
         - optimized-tests
 
 windows7-32/debug:
     build-platform: win32/debug
     test-sets:
         - common-tests
 
 # win64
 windows10-64/opt:
     build-platform: win64/opt
     test-sets:
         - common-tests
         - optimized-tests
 
-windows10-64-shippable/opt:
-    build-platform: win64-shippable/opt
+windows10-64-nightly/opt:
+    build-platform: win64-nightly/opt
     test-sets:
         - common-tests
         - optimized-tests
 
 windows10-64/debug:
     build-platform: win64/debug
     test-sets:
         - common-tests
 
 # MacOS X platforms (matching /macosx.*/)
 
 macosx64/debug:
     build-platform: macosx64/debug
     test-sets:
         - common-tests
 
-macosx64-shippable/opt:
-    build-platform: macosx64-shippable/opt
+macosx64/opt:
+    build-platform: macosx64/opt
     test-sets:
         - common-tests
         - optimized-tests
+
+macosx64-nightly/opt:
+    build-platform: macosx64-nightly/opt
+    test-sets:
+        - common-tests
+        - optimized-tests
--- a/taskcluster/ci/upload-symbols/kind.yml
+++ b/taskcluster/ci/upload-symbols/kind.yml
@@ -8,21 +8,21 @@ transforms:
     - taskgraph.transforms.upload_symbols:transforms
     - taskgraph.transforms.job:transforms
     - taskgraph.transforms.task:transforms
 
 kind-dependencies:
     - build
 
 only-for-build-platforms:
-    - linux64-shippable/opt
-    - linux-shippable/opt
-    - macosx64-shippable/opt
-    - win32-shippable/opt
-    - win64-shippable/opt
+    - linux64-nightly/opt
+    - linux-nightly/opt
+    - macosx64-nightly/opt
+    - win32-nightly/opt
+    - win64-nightly/opt
 
 job-template:
     description: Upload Symbols
     worker-type: b-linux
     worker:
         docker-image: {in-tree: "lint"}
         max-run-time: 900
         env: