Bug 1443104 - Properly fix the missing en-US and win4 stub installer for release-bouncer-submission. r=jlorenzo. a=release DONTBUILD
authorMihai Tabara <mtabara@mozilla.com>
Thu, 08 Mar 2018 17:15:15 +0000
changeset 462245 4c664530b7e36e2abdb73e1accded6c9df9da2eb
parent 462244 9a824b10df478f7fcc40335782cad8c7cf8b7d29
child 462246 018578db02247c7262593ef308c70961ace7c85e
push id1683
push usersfraser@mozilla.com
push dateThu, 26 Apr 2018 16:43:40 +0000
treeherdermozilla-release@5af6cb21869d [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersjlorenzo, release
bugs1443104
milestone60.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 1443104 - Properly fix the missing en-US and win4 stub installer for release-bouncer-submission. r=jlorenzo. a=release DONTBUILD MozReview-Commit-ID: 6tEcjiprg91
taskcluster/ci/release-bouncer-sub/kind.yml
taskcluster/taskgraph/transforms/bouncer_submission.py
--- a/taskcluster/ci/release-bouncer-sub/kind.yml
+++ b/taskcluster/ci/release-bouncer-sub/kind.yml
@@ -26,17 +26,17 @@ job-defaults:
          mozilla-release:
             - project:releng:bouncer:action:submission
             - project:releng:bouncer:server:production
          default:
             - project:releng:bouncer:action:submission
             - project:releng:bouncer:server:staging
    run-on-projects: []
    shipping-phase: promote
-   locales-file: browser/locales/l10n-changesets.json
+   locales-file: browser/locales/shipped-locales
 
 jobs:
    devedition:
       bouncer-platforms: ['linux', 'linux64', 'osx', 'win', 'win64']
       bouncer-products: ['complete-mar', 'installer', 'installer-ssl', 'partial-mar', 'stub-installer']
       shipping-product: devedition
 
    fennec:
--- a/taskcluster/taskgraph/transforms/bouncer_submission.py
+++ b/taskcluster/taskgraph/transforms/bouncer_submission.py
@@ -87,18 +87,24 @@ def make_task_worker(config, jobs):
     for job in jobs:
         resolve_keyed_by(
             job, 'worker-type', item_name=job['name'], project=config.params['project']
         )
         resolve_keyed_by(
             job, 'scopes', item_name=job['name'], project=config.params['project']
         )
 
-        # No need to filter out ja-JP-mac, we need to upload both
-        all_locales = list(sorted(parse_locales_file(job['locales-file']).keys()))
+        # No need to filter out ja-JP-mac, we need to upload both; but we do
+        # need to filter out the platforms they come with
+        all_locales = sorted([
+            locale
+            for locale in parse_locales_file(job['locales-file']).keys()
+            if locale not in ('linux', 'win32', 'osx')
+        ])
+
         job['worker']['locales'] = all_locales
         job['worker']['entries'] = craft_bouncer_entries(config, job)
 
         del job['locales-file']
         del job['bouncer-platforms']
         del job['bouncer-products']
 
         if job['worker']['entries']:
@@ -171,16 +177,21 @@ def craft_paths_per_bouncer_platform(pro
             # Some bouncer product like stub-installer are only meant to be on Windows.
             # Thus no default value is defined there
             continue
 
         file_name = file_name_template.format(
             version=current_version, previous_version=strip_build_data(previous_version)
         )
 
+        # We currently have a sole win32 stub installer that is to be used
+        # in both windows platforms to toggle between full installers
+        if 'Installer.exe' in file_name and ftp_platform == 'win64':
+            ftp_platform = 'win32'
+
         path_template = CONFIG_PER_BOUNCER_PRODUCT[bouncer_product]['path_template']
         file_relative_location = path_template.format(
             product=product.lower(),
             version=current_version,
             build_number=current_build_number,
             update_folder='update/' if '-mar' in bouncer_product else '',
             ftp_platform=ftp_platform,
             file=file_name,