Bug 1541089: Fix declarative artifacts on release for shippable builds; r=mtabara
authorTom Prince <mozilla@hocat.ca>
Wed, 17 Apr 2019 12:37:52 +0000
changeset 469856 cdaa316e08f54ac8dc5efd6003f15365d6289d0f
parent 469855 a7af13fee7b22d8a56d75bb72fc1191792dab23d
child 469857 a0eb669e2d77cd005c0da54375f8994f9e353c91
push id35883
push userbtara@mozilla.com
push dateWed, 17 Apr 2019 21:47:29 +0000
treeherdermozilla-central@02b89c29412b [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmtabara
bugs1541089
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 1541089: Fix declarative artifacts on release for shippable builds; r=mtabara Differential Revision: https://phabricator.services.mozilla.com/D27753
taskcluster/taskgraph/manifests/firefox_candidates.yml
taskcluster/taskgraph/manifests/firefox_candidates_checksums.yml
--- a/taskcluster/taskgraph/manifests/firefox_candidates.yml
+++ b/taskcluster/taskgraph/manifests/firefox_candidates.yml
@@ -40,43 +40,43 @@ tasktype_map:
   partials-signing: signing
   repackage: repackage
   repackage-signing: repackage
   repackage-signing-msi: repackage
   release-sign-and-push-langpacks: scriptworker
 platform_names:
   path_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'
   tools_platform:
     by-platform:
-      linux-nightly: 'linux'
-      linux64-nightly: 'linux64'
+      linux-shippable: 'linux'
+      linux64-shippable: 'linux64'
       linux64-asan-reporter-nightly: 'linux-x86_64-asan-reporter'
-      macosx64-nightly: 'macosx64'
-      win32-nightly: 'win32'
-      win64-nightly: 'win64'
-      win64-aarch64-nightly: 'win64-aarch64'
+      macosx64-shippable: 'macosx64'
+      win32-shippable: 'win32'
+      win64-shippable: 'win64'
+      win64-aarch64-shippable: 'win64-aarch64'
       win64-asan-reporter-nightly: 'win64-asan-reporter'
   filename_platform:
     by-platform:
-      linux-nightly: 'linux'
-      linux64-nightly: 'linux64'
+      linux-shippable: 'linux'
+      linux64-shippable: 'linux64'
       linux64-asan-reporter-nightly: 'linux-x86_64-asan-reporter'
-      macosx64-nightly: 'macosx64'
-      win32-nightly: 'win32'
-      win64-nightly: 'win64'
-      win64-aarch64-nightly: 'win64_aarch64'
+      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: '${locale}/'
@@ -184,152 +184,152 @@ mapping:
     <<: *default
     all_locales: true
     description: "Localized repack that grabs a packaged en-US Firefox and repackages it as locale-specific Firefox"
     locale_prefix: ''
     source_path_modifier: '${locale}'
     from:
       - release-sign-and-push-langpacks
     only_for_platforms:
-      - linux-nightly
-      - linux64-nightly
-      - macosx64-nightly
-      - win32-nightly
-      - win64-nightly
+      - linux-shippable
+      - linux64-shippable
+      - macosx64-shippable
+      - win32-shippable
+      - win64-shippable
     pretty_name: ${locale}.xpi
     checksums_path: ${path_platform}/xpi/${locale}.xpi
     destinations:
       - ${version}-candidates/build${build_number}/${path_platform}/xpi
   mar:
     <<: *default
     description: "Alongside `mbsdiff`, a tool used to generate partials"
     locale_prefix: ''
     source_path_modifier: 'host/bin'
     pretty_name: ${tools_platform}/mar
     checksums_path: mar-tools/${tools_platform}/mar
     not_for_platforms:
-      - win32-nightly
-      - win64-nightly
-      - win64-aarch64-nightly
+      - win32-shippable
+      - win64-shippable
+      - win64-aarch64-shippable
     destinations:
       - ${version}-candidates/build${build_number}/mar-tools
   mbsdiff:
     <<: *default
     description: "Alongside `mar`, a tool used to generate partials"
     locale_prefix: ''
     source_path_modifier: 'host/bin'
     pretty_name: ${tools_platform}/mbsdiff
     checksums_path: mar-tools/${tools_platform}/mbsdiff
     not_for_platforms:
-      - win32-nightly
-      - win64-nightly
-      - win64-aarch64-nightly
+      - win32-shippable
+      - win64-shippable
+      - win64-aarch64-shippable
     destinations:
       - ${version}-candidates/build${build_number}/mar-tools
   mar.exe:
     <<: *default
     description: "Alongside `mbsdiff.exe`, a tool used to generate partials for Windows platforms"
     locale_prefix: ''
     source_path_modifier: 'host/bin'
     pretty_name: ${tools_platform}/mar.exe
     checksums_path: mar-tools/${tools_platform}/mar.exe
     only_for_platforms:
-      - win32-nightly
-      - win64-nightly
-      - win64-aarch64-nightly
+      - win32-shippable
+      - win64-shippable
+      - win64-aarch64-shippable
     destinations:
       - ${version}-candidates/build${build_number}/mar-tools
   mbsdiff.exe:
     <<: *default
     locale_prefix: ''
     description: "Alongside `mar.exe`, a tool used to generate partials for Windows platforms"
     source_path_modifier: 'host/bin'
     pretty_name: ${tools_platform}/mbsdiff.exe
     checksums_path: mar-tools/${tools_platform}/mbsdiff.exe
     only_for_platforms:
-      - win32-nightly
-      - win64-nightly
-      - win64-aarch64-nightly
+      - win32-shippable
+      - win64-shippable
+      - win64-aarch64-shippable
     destinations:
       - ${version}-candidates/build${build_number}/mar-tools
   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
     pretty_name: firefox-${version}.tar.bz2
     checksums_path: ${path_platform}/${locale}/firefox-${version}.tar.bz2
   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
     pretty_name: firefox-${version}.tar.bz2.asc
     checksums_path: ${path_platform}/${locale}/firefox-${version}.tar.bz2.asc
   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}.dmg
     checksums_path: ${path_platform}/${locale}/Firefox ${version}.dmg
   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
     pretty_name: firefox-${version}.zip
     checksums_path: ${path_platform}/${locale}/firefox-${version}.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
     pretty_name: Firefox Setup ${version}.exe
     checksums_path: ${path_platform}/${locale}/Firefox Setup ${version}.exe
   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.exe
     checksums_path: ${path_platform}/${locale}/Firefox Installer.exe
   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 Setup ${version}.msi
     checksums_path: ${path_platform}/${locale}/Firefox Setup ${version}.msi
   target.complete.mar:
     <<: *default
     description: "The main installer we ship our mobile products baked within"
     all_locales: true
     from:
       - mar-signing
--- a/taskcluster/taskgraph/manifests/firefox_candidates_checksums.yml
+++ b/taskcluster/taskgraph/manifests/firefox_candidates_checksums.yml
@@ -37,30 +37,24 @@ s3_bucket_paths:
 default_locales:
   - en-US
 tasktype_map:
   checksums-signing: signing
   release-beetmover-signed-langpacks: signing
 platform_names:
   path_platform:
     by-platform:
-      linux-nightly: 'linux-i686'
-      linux64-nightly: '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'
-      win64-asan-reporter-nightly: 'win64-asan-reporter'
       linux-shippable: 'linux-i686'
       linux64-shippable: 'linux-x86_64'
+      linux64-asan-reporter-nightly: 'linux-x86_64-asan-reporter'
       macosx64-shippable: 'mac'
       win32-shippable: 'win32'
       win64-shippable: 'win64'
       win64-aarch64-shippable: 'win64-aarch64'
+      win64-asan-reporter-nightly: 'win64-asan-reporter'
       linux: 'linux-i686'
       linux64: 'linux-x86_64'
       macosx64: 'mac'
       win32: 'win32'
       win64: 'win64'
 
 default: &default
   from: