Dated destinations are first because of beetmover assumptions.
authorMihai Tabara <mtabara@mozilla.com>
Thu, 21 Mar 2019 09:29:14 +0000
changeset 506580 ade6d62b89c9bf4c7b7c7516c1b5531884dda3db
parent 506579 18f5257ac6dfa7af8eccde8455f0469961d74b5c
child 506581 68e3236a8f054a3d741bfca7ec7a92926eafdfdc
push id143
push usermtabara@mozilla.com
push dateMon, 25 Mar 2019 16:25:54 +0000
milestone68.0a1
Dated destinations are first because of beetmover assumptions.
taskcluster/taskgraph/manifests/fennec_nightly.yml
taskcluster/taskgraph/manifests/fennec_nightly_checksums.yml
taskcluster/taskgraph/manifests/firefox_nightly.yml
taskcluster/taskgraph/manifests/firefox_nightly_checksums.yml
--- a/taskcluster/taskgraph/manifests/fennec_nightly.yml
+++ b/taskcluster/taskgraph/manifests/fennec_nightly.yml
@@ -37,24 +37,24 @@ default: &default
       en-US: '${locale}/'
   source_path_modifier:  # Anything between artifact prefix and filename
     by-locale:
       default: '${locale}'
       multi: ''
   destinations:  # locale_prefix is appended
     by-locale:
       multi:
-        - latest-${branch}-${path_platform}
         - ${year}/${month}/${upload_date}-${branch}-${path_platform}
-      en-US:
         - latest-${branch}-${path_platform}
+      en-US:
         - ${year}/${month}/${upload_date}-${branch}-${path_platform}
+        - latest-${branch}-${path_platform}
       default:
+        - ${year}/${month}/${upload_date}-${branch}-${path_platform}-l10n
         - latest-${branch}-${path_platform}-l10n
-        - ${year}/${month}/${upload_date}-${branch}-${path_platform}-l10n
 
 # Configuration for individual files. Extends 'default', above.
 mapping:
   buildhub.json:
     <<: *default
     all_locales: true
     description: "Build related information to be consumed by Buildhub service"
     locale_prefix: ''
--- a/taskcluster/taskgraph/manifests/fennec_nightly_checksums.yml
+++ b/taskcluster/taskgraph/manifests/fennec_nightly_checksums.yml
@@ -31,24 +31,24 @@ default: &default
   locale_prefix:
     by-locale:
       default: ''
       en-US: '${locale}/'
   source_path_modifier: ''
   destinations:  # locale_prefix is appended
     by-locale:
       multi:
-        - latest-${branch}-${path_platform}
         - ${year}/${month}/${upload_date}-${branch}-${path_platform}
-      en-US:
         - latest-${branch}-${path_platform}
+      en-US:
         - ${year}/${month}/${upload_date}-${branch}-${path_platform}
+        - latest-${branch}-${path_platform}
       default:
+        - ${year}/${month}/${upload_date}-${branch}-${path_platform}-l10n
         - latest-${branch}-${path_platform}-l10n
-        - ${year}/${month}/${upload_date}-${branch}-${path_platform}-l10n
 
 # Configuration for individual files. Extends 'default', above.
 mapping:
   target.checksums:
     <<: *default
     description: "Checksums file containing size, hash, sha algorithm and filename"
     pretty_name: fennec-${version}.${locale}.${filename_platform}.checksums
     checksums_path: fennec-${version}.${locale}.${filename_platform}.checksums
--- a/taskcluster/taskgraph/manifests/firefox_nightly.yml
+++ b/taskcluster/taskgraph/manifests/firefox_nightly.yml
@@ -72,37 +72,37 @@ default: &default
   locale_prefix: ''
   source_path_modifier:
     by-locale:
       default: '${locale}'
       en-US: ''
   destinations:
     by-locale:
       en-US:
+        - ${year}/${month}/${upload_date}-${branch}
         - latest-${branch}
-        - ${year}/${month}/${upload_date}-${branch}
       default:
+        - ${year}/${month}/${upload_date}-${branch}-l10n
         - latest-${branch}-l10n
-        - ${year}/${month}/${upload_date}-${branch}-l10n
 
 mapping:
   buildhub.json:
     <<: *default
     description: "Build related information to be consumed by Buildhub service"
     pretty_name: firefox-${version}.${locale}.${filename_platform}.buildhub.json
     checksums_path: firefox-${version}.${locale}.${filename_platform}.buildhub.json
     destinations:
       by-locale:
         en-US:
+          - ${year}/${month}/${upload_date}-${branch}
           - latest-${branch}
-          - ${year}/${month}/${upload_date}-${branch}
           - latest-${branch}-l10n
         default:
+          - ${year}/${month}/${upload_date}-${branch}-l10n
           - latest-${branch}-l10n
-          - ${year}/${month}/${upload_date}-${branch}-l10n
   target.common.tests.tar.gz:
     <<: *default
     description: "Mixture of reftests, mochitests, UI and others, commonly bundled together in a test suite"
     pretty_name: firefox-${version}.${locale}.${filename_platform}.common.tests.tar.gz
     checksums_path: firefox-${version}.${locale}.${filename_platform}.common.tests.tar.gz
   target.cppunittest.tests.tar.gz:
     <<: *default
     description: "C++ unittests related in-tree test infrastructure"
@@ -200,138 +200,138 @@ mapping:
       - win64-aarch64-nightly
       - 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}
           - latest-${branch}
-          - ${year}/${month}/${upload_date}-${branch}
         default:
+          - ${year}/${month}/${upload_date}-${branch}-l10n/${filename_platform}/xpi
           - latest-${branch}-l10n/${filename_platform}/xpi
-          - ${year}/${month}/${upload_date}-${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
       - win64-asan-reporter-nightly
     destinations:
+      - ${year}/${month}/${upload_date}-${branch}/mar-tools/${stage_platform}
       - latest-${branch}/mar-tools/${stage_platform}
-      - ${year}/${month}/${upload_date}-${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
       - win64-asan-reporter-nightly
     destinations:
+      - ${year}/${month}/${upload_date}-${branch}/mar-tools/${stage_platform}
       - latest-${branch}/mar-tools/${stage_platform}
-      - ${year}/${month}/${upload_date}-${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
       - win64-asan-reporter-nightly
     destinations:
+      - ${year}/${month}/${upload_date}-${branch}/mar-tools/${stage_platform}
       - latest-${branch}/mar-tools/${stage_platform}
-      - ${year}/${month}/${upload_date}-${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
       - win64-asan-reporter-nightly
     destinations:
+      - ${year}/${month}/${upload_date}-${branch}/mar-tools/${stage_platform}
       - latest-${branch}/mar-tools/${stage_platform}
-      - ${year}/${month}/${upload_date}-${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
       - 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}
-          - ${year}/${month}/${upload_date}-${branch}
           - latest-${branch}-l10n
         default:
+          - ${year}/${month}/${upload_date}-${branch}-l10n
           - latest-${branch}-l10n
-          - ${year}/${month}/${upload_date}-${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
       - 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}
-          - ${year}/${month}/${upload_date}-${branch}
           - latest-${branch}-l10n
         default:
+          - ${year}/${month}/${upload_date}-${branch}-l10n
           - latest-${branch}-l10n
-          - ${year}/${month}/${upload_date}-${branch}-l10n
   target.dmg:
     <<: *default
     description: "Main package installer for Mac OS X platforms"
     all_locales: true
     from:
       - repackage
     only_for_platforms:
       - macosx64-nightly
     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}
-          - ${year}/${month}/${upload_date}-${branch}
           - latest-${branch}-l10n
         default:
+          - ${year}/${month}/${upload_date}-${branch}-l10n
           - latest-${branch}-l10n
-          - ${year}/${month}/${upload_date}-${branch}-l10n
   target.zip:
     <<: *default
     description: "Main package installer for Windows platforms"
     all_locales: true
     from:
       - signing
     only_for_platforms:
       - win64-nightly
@@ -351,79 +351,79 @@ mapping:
       - win32-nightly
       - win64-aarch64-nightly
       - 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}
-          - ${year}/${month}/${upload_date}-${branch}
           - latest-${branch}-l10n
         default:
+          - ${year}/${month}/${upload_date}-${branch}-l10n
           - latest-${branch}-l10n
-          - ${year}/${month}/${upload_date}-${branch}-l10n
   target.stub-installer.exe:
     <<: *default
     description: "Stub installer for Win32 platforms"
     all_locales: true
     from:
       - repackage-signing
     only_for_platforms:
       - win32-nightly
     pretty_name: Firefox Installer.${locale}.exe
     checksums_path: Firefox Installer.${locale}.exe
     destinations:
       by-locale:
         en-US:
+          - ${year}/${month}/${upload_date}-${branch}
           - latest-${branch}
-          - ${year}/${month}/${upload_date}-${branch}
           - latest-${branch}-l10n
         default:
+          - ${year}/${month}/${upload_date}-${branch}-l10n
           - latest-${branch}-l10n
-          - ${year}/${month}/${upload_date}-${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
     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}
-          - ${year}/${month}/${upload_date}-${branch}
           - latest-${branch}-l10n
         default:
+          - ${year}/${month}/${upload_date}-${branch}-l10n
           - latest-${branch}-l10n
-          - ${year}/${month}/${upload_date}-${branch}-l10n
   target.complete.mar:
     <<: *default
     description: "The main installer we ship our mobile products baked within"
     all_locales: true
     from:
       - mar-signing
     pretty_name: firefox-${version}.${locale}.${filename_platform}.complete.mar
     checksums_path: firefox-${version}.${locale}.${filename_platform}.complete.mar
     update_balrog_manifest: true
     destinations:
       by-locale:
         en-US:
+          - ${year}/${month}/${upload_date}-${branch}
           - latest-${branch}
-          - ${year}/${month}/${upload_date}-${branch}
           - latest-${branch}-l10n
         default:
+          - ${year}/${month}/${upload_date}-${branch}-l10n
           - latest-${branch}-l10n
-          - ${year}/${month}/${upload_date}-${branch}-l10n
   ${partial}:
     <<: *default
     description: "Partials MAR files to serve as updates"
     all_locales: true
     from:
       - partials-signing
     partials_only: true
     pretty_name: firefox-${branch}-${version}-${filename_platform}-${locale}-${from_buildid}-${buildid}.partial.mar
--- a/taskcluster/taskgraph/manifests/firefox_nightly_checksums.yml
+++ b/taskcluster/taskgraph/manifests/firefox_nightly_checksums.yml
@@ -31,22 +31,22 @@ default: &default
     - checksums-signing
   all_locales: true
   description: "TO_BE_OVERRIDDEN"
   locale_prefix: ''
   source_path_modifier: ''
   destinations:  # locale_prefix is appended
     by-locale:
       en-US:
+        - ${year}/${month}/${upload_date}-${branch}
         - latest-${branch}
         - latest-${branch}-l10n
-        - ${year}/${month}/${upload_date}-${branch}
       default:
+        - ${year}/${month}/${upload_date}-${branch}-l10n
         - latest-${branch}-l10n
-        - ${year}/${month}/${upload_date}-${branch}-l10n
 
 # Configuration for individual files. Extends 'default', above.
 mapping:
   target.checksums:
     <<: *default
     description: "Checksums file containing size, hash, sha algorithm and filename"
     pretty_name: firefox-${version}.${locale}.${filename_platform}.checksums
     checksums_path: firefox-${version}.${locale}.${filename_platform}.checksums