Bug 1352113 - Shippable Builds - Account for new declarative artifacts work. r=mtabara
☠☠ backed out by aea38cfc632a ☠ ☠
authorJustin Wood <Callek@gmail.com>
Tue, 26 Mar 2019 10:46:55 +0000
changeset 466162 4943b23813fe56a358febd1617e51937afc6943f
parent 466161 4b9413d05816c6db9779f1c3165c9a6f4f7d3d06
child 466163 3ce13940a2a35105b30caae1b1f69db78d4d7cdc
push id35762
push usercsabou@mozilla.com
push dateWed, 27 Mar 2019 04:44:00 +0000
treeherdermozilla-central@bc572aee49b6 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmtabara
bugs1352113
milestone68.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1352113 - Shippable Builds - Account for new declarative artifacts work. r=mtabara Differential Revision: https://phabricator.services.mozilla.com/D24831
taskcluster/taskgraph/manifests/firefox_nightly.yml
taskcluster/taskgraph/manifests/firefox_nightly_checksums.yml
taskcluster/taskgraph/util/scriptworker.py
--- a/taskcluster/taskgraph/manifests/firefox_nightly.yml
+++ b/taskcluster/taskgraph/manifests/firefox_nightly.yml
@@ -40,33 +40,33 @@ tasktype_map:
   partials-signing: signing
   repackage: repackage
   repackage-signing: repackage
   repackage-signing-msi: repackage
 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
   from:
     - build
   all_locales: false
   description: "TO_BE_OVERRIDDEN"
   locale_prefix: ''
@@ -186,23 +186,23 @@ mapping:
       - win64-asan-reporter-nightly
   target.langpack.xpi:
     <<: *default
     all_locales: true
     description: "Localized repack that grabs a packaged en-US Firefox and repackages it as locale-specific Firefox"
     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
     checksums_path: firefox-${version}.${locale}.langpack.xpi
     destinations:
       by-locale:
         en-US:
           - ${year}/${month}/${upload_date}-${branch}
@@ -212,74 +212,74 @@ mapping:
           - latest-${branch}-l10n/${filename_platform}/xpi
   mar:
     <<: *default
     description: "Alongside `mbsdiff`, a tool used to generate partials"
     source_path_modifier: 'host/bin'
     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}
       - latest-${branch}/mar-tools/${stage_platform}
   mbsdiff:
     <<: *default
     description: "Alongside `mar`, a tool used to generate partials"
     source_path_modifier: 'host/bin'
     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}
       - latest-${branch}/mar-tools/${stage_platform}
   mar.exe:
     <<: *default
     description: "Alongside `mbsdiff.exe`, a tool used to generate partials for Windows platforms"
     source_path_modifier: 'host/bin'
     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}
       - latest-${branch}/mar-tools/${stage_platform}
   mbsdiff.exe:
     <<: *default
     description: "Alongside `mar.exe`, a tool used to generate partials for Windows platforms"
     source_path_modifier: 'host/bin'
     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}
       - latest-${branch}/mar-tools/${stage_platform}
   target.tar.bz2:
     <<: *default
     description: "Main installer for Linux platforms"
     all_locales: true
     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
     destinations:
       by-locale:
         en-US:
           - ${year}/${month}/${upload_date}-${branch}
           - latest-${branch}
@@ -289,18 +289,18 @@ mapping:
           - latest-${branch}-l10n
   target.tar.bz2.asc:
     <<: *default
     description: "Detached signature for the checksums file"
     all_locales: true
     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
     destinations:
       by-locale:
         en-US:
           - ${year}/${month}/${upload_date}-${branch}
           - latest-${branch}
@@ -310,17 +310,17 @@ mapping:
           - latest-${branch}-l10n
   target.dmg:
     <<: *default
     description: "Main package installer for Mac OS X platforms"
     all_locales: true
     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:
       by-locale:
         en-US:
           - ${year}/${month}/${upload_date}-${branch}
           - latest-${branch}
           - latest-${branch}-l10n
@@ -329,32 +329,32 @@ mapping:
           - latest-${branch}-l10n
   target.zip:
     <<: *default
     description: "Main package installer for Windows platforms"
     all_locales: true
     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
   target.installer.exe:
     <<: *default
     description: "Main installer for Windows platforms"
     all_locales: true
     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
     destinations:
       by-locale:
         en-US:
           - ${year}/${month}/${upload_date}-${branch}
           - latest-${branch}
@@ -364,17 +364,17 @@ mapping:
           - latest-${branch}-l10n
   target.stub-installer.exe:
     <<: *default
     description: "Stub installer for Win32 platforms"
     all_locales: true
     from:
       - repackage-signing
     only_for_platforms:
-      - win32-nightly
+      - win32-shippable
     pretty_name: Firefox Installer.${locale}.exe
     checksums_path: Firefox Installer.${locale}.exe
     destinations:
       by-locale:
         en-US:
           - ${year}/${month}/${upload_date}-${branch}
           - latest-${branch}
           - latest-${branch}-l10n
@@ -383,18 +383,18 @@ mapping:
           - latest-${branch}-l10n
   target.installer.msi:
     <<: *default
     description: "Windows installer for MSI platform"
     all_locales: true
     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:
       by-locale:
         en-US:
           - ${year}/${month}/${upload_date}-${branch}
           - latest-${branch}
           - latest-${branch}-l10n
--- a/taskcluster/taskgraph/manifests/firefox_nightly_checksums.yml
+++ b/taskcluster/taskgraph/manifests/firefox_nightly_checksums.yml
@@ -8,23 +8,23 @@ s3_bucket_paths:
 default_locales:  # if given an empty locale, use these locales
   - en-US
 tasktype_map:  # Map task reference to task type.
   checksums-signing: signing
 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: ''
 
 # A default entry, which the mappings below extend and override.
 # Final 'destinations' will be the product of:
 # s3_bucket_paths + destinations + locale_prefix + pretty_name
 default: &default
   from:
--- a/taskcluster/taskgraph/util/scriptworker.py
+++ b/taskcluster/taskgraph/util/scriptworker.py
@@ -815,22 +815,22 @@ def should_use_artifact_map(platform, pr
         'android',
         'fennec'
     ]
     projects = ['mozilla-central', 'mozilla-beta', 'mozilla-release']
     if any([pl in platform for pl in platforms]) and any([pj in project for pj in projects]):
         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',
     ]
     projects = ['mozilla-central']
     if any([pl in platform for pl in platforms]) and any([pj in project for pj in projects]):
         return True
 
     return False