Bug 1352113 - Shippable Builds - Account for new declarative artifacts work. r=mtabara

Differential Revision: https://phabricator.services.mozilla.com/D24831

--HG--
extra : moz-landing-system : lando

taskcluster/taskgraph/manifests/firefox_nightly.yml

@@ -45,23 +45,23 @@ platform_names:
   path_platform: ''
   filename_platform:
     by-platform:
-      linux-nightly: 'linux-i686'
-      linux64-nightly: 'linux-x86_64'
+      linux-shippable: 'linux-i686'
+      linux64-shippable: 'linux-x86_64'
       linux64-asan-reporter-nightly: 'linux-x86_64-asan-reporter'
-      macosx64-nightly: 'mac'
-      win32-nightly: 'win32'
-      win64-nightly: 'win64'
-      win64-aarch64-nightly: 'win64-aarch64'
+      macosx64-shippable: 'mac'
+      win32-shippable: 'win32'
+      win64-shippable: 'win64'
+      win64-aarch64-shippable: 'win64-aarch64'
       win64-asan-reporter-nightly: 'win64-asan-reporter'
   stage_platform:
     by-platform:
-      linux-nightly: 'linux'
+      linux-shippable: 'linux'
       linux64-asan-reporter-nightly: 'linux64-asan-reporter'
-      linux64-nightly: 'linux64'
-      macosx64-nightly: 'macosx64'
-      win32-nightly: 'win32'
-      win64-nightly: 'win64'
-      win64-aarch64-nightly: 'win64-aarch64'
+      linux64-shippable: 'linux64'
+      macosx64-shippable: 'macosx64'
+      win32-shippable: 'win32'
+      win64-shippable: 'win64'
+      win64-aarch64-shippable: 'win64-aarch64'
       win64-asan-reporter-nightly: 'win64-asan-reporter'
 
 default: &default
@@ -191,13 +191,13 @@ mapping:
     from:
       - build
     only_for_platforms:
-      - linux-nightly
-      - linux64-nightly
-      - macosx64-nightly
-      - win64-nightly
-      - win32-nightly
-      - win64-nightly
-      - win64-aarch64-nightly
+      - linux-shippable
+      - linux64-shippable
+      - macosx64-shippable
+      - win64-shippable
+      - win32-shippable
+      - win64-shippable
+      - win64-aarch64-shippable
       - win64-asan-reporter-nightly
       - linux64-asan-reporter-nightly
     pretty_name: firefox-${version}.${locale}.langpack.xpi
@@ -217,9 +217,9 @@ mapping:
     pretty_name: mar
     checksums_path: mar
     not_for_platforms:
-      - win32-nightly
-      - win64-nightly
-      - win64-aarch64-nightly
+      - win32-shippable
+      - win64-shippable
+      - win64-aarch64-shippable
       - win64-asan-reporter-nightly
     destinations:
       - ${year}/${month}/${upload_date}-${branch}/mar-tools/${stage_platform}
@@ -231,9 +231,9 @@ mapping:
     pretty_name: mbsdiff
     checksums_path: mbsdiff
     not_for_platforms:
-      - win32-nightly
-      - win64-nightly
-      - win64-aarch64-nightly
+      - win32-shippable
+      - win64-shippable
+      - win64-aarch64-shippable
       - win64-asan-reporter-nightly
     destinations:
       - ${year}/${month}/${upload_date}-${branch}/mar-tools/${stage_platform}
@@ -245,9 +245,9 @@ mapping:
     pretty_name: mar.exe
     checksums_path: mar.exe
     only_for_platforms:
-      - win32-nightly
-      - win64-nightly
-      - win64-aarch64-nightly
+      - win32-shippable
+      - win64-shippable
+      - win64-aarch64-shippable
       - win64-asan-reporter-nightly
     destinations:
       - ${year}/${month}/${upload_date}-${branch}/mar-tools/${stage_platform}
@@ -259,9 +259,9 @@ mapping:
     pretty_name: mbsdiff.exe
     checksums_path: mbsdiff.exe
     only_for_platforms:
-      - win32-nightly
-      - win64-nightly
-      - win64-aarch64-nightly
+      - win32-shippable
+      - win64-shippable
+      - win64-aarch64-shippable
       - win64-asan-reporter-nightly
     destinations:
       - ${year}/${month}/${upload_date}-${branch}/mar-tools/${stage_platform}
@@ -273,8 +273,8 @@ mapping:
     from:
       - signing
     only_for_platforms:
-      - linux-nightly
-      - linux64-nightly
+      - linux-shippable
+      - linux64-shippable
       - linux64-asan-reporter-nightly
     pretty_name: firefox-${version}.${locale}.${filename_platform}.tar.bz2
     checksums_path: firefox-${version}.${locale}.${filename_platform}.tar.bz2
@@ -294,8 +294,8 @@ mapping:
     from:
       - signing
     only_for_platforms:
-      - linux-nightly
-      - linux64-nightly
+      - linux-shippable
+      - linux64-shippable
       - linux64-asan-reporter-nightly
     pretty_name: firefox-${version}.${locale}.${filename_platform}.tar.bz2.asc
     checksums_path: firefox-${version}.${locale}.${filename_platform}.tar.bz2.asc
@@ -315,7 +315,7 @@ mapping:
     from:
       - repackage
     only_for_platforms:
-      - macosx64-nightly
+      - macosx64-shippable
     pretty_name: firefox-${version}.${locale}.${filename_platform}.dmg
     checksums_path: firefox-${version}.${locale}.${filename_platform}.dmg
     destinations:
@@ -334,9 +334,9 @@ mapping:
     from:
       - signing
     only_for_platforms:
-      - win64-nightly
-      - win32-nightly
-      - win64-aarch64-nightly
+      - win64-shippable
+      - win32-shippable
+      - win64-aarch64-shippable
       - win64-asan-reporter-nightly
     pretty_name: firefox-${version}.${locale}.${filename_platform}.zip
     checksums_path: firefox-${version}.${locale}.${filename_platform}.zip
@@ -347,9 +347,9 @@ mapping:
     from:
       - repackage-signing
     only_for_platforms:
-      - win64-nightly
-      - win32-nightly
-      - win64-aarch64-nightly
+      - win64-shippable
+      - win32-shippable
+      - win64-aarch64-shippable
       - win64-asan-reporter-nightly
     pretty_name: firefox-${version}.${locale}.${filename_platform}.installer.exe
     checksums_path: firefox-${version}.${locale}.${filename_platform}.installer.exe
@@ -369,7 +369,7 @@ mapping:
     from:
       - repackage-signing
     only_for_platforms:
-      - win32-nightly
+      - win32-shippable
     pretty_name: Firefox Installer.${locale}.exe
     checksums_path: Firefox Installer.${locale}.exe
     destinations:
@@ -388,8 +388,8 @@ mapping:
     from:
       - repackage-signing-msi
     only_for_platforms:
-      - win64-nightly
-      - win32-nightly
+      - win64-shippable
+      - win32-shippable
     pretty_name: firefox-${version}.${locale}.${filename_platform}.installer.msi
     checksums_path: firefox-${version}.${locale}.${filename_platform}.installer.msi
     destinations:

taskcluster/taskgraph/manifests/firefox_nightly_checksums.yml

@@ -13,13 +13,13 @@ platform_names:
   path_platform: ''
   filename_platform:
     by-platform:
-      linux-nightly: 'linux-i686'
-      linux64-nightly: 'linux-x86_64'
+      linux-shippable: 'linux-i686'
+      linux64-shippable: 'linux-x86_64'
       linux64-asan-reporter-nightly: 'linux-x86_64-asan-reporter'
-      macosx64-nightly: 'mac'
-      win32-nightly: 'win32'
-      win64-nightly: 'win64'
-      win64-aarch64-nightly: 'win64-aarch64'
+      macosx64-shippable: 'mac'
+      win32-shippable: 'win32'
+      win64-shippable: 'win64'
+      win64-aarch64-shippable: 'win64-aarch64'
       win64-asan-reporter-nightly: 'win64-asan-reporter'
   stage_platform: ''
 

taskcluster/taskgraph/util/scriptworker.py

@@ -820,12 +820,12 @@ def should_use_artifact_map(platform, project):
         return True
 
     platforms = [
-        'linux-nightly',
-        'linux64-nightly',
-        'macosx64-nightly',
-        'win32-nightly',
-        'win64-nightly',
-        'win64-aarch64-nightly',
+        'linux-shippable',
+        'linux64-shippable',
+        'macosx64-shippable',
+        'win32-shippable',
+        'win64-shippable',
+        'win64-aarch64-shippable',
         'win64-asan-reporter-nightly',
         'linux64-asan-reporter-nightly',
     ]