Bug 1496090 - mozapkpublisher: Do not call version specific URLs anymore r=mtabara
authorJohan Lorenzo <jlorenzo@mozilla.com>
Fri, 05 Oct 2018 10:53:32 +0000
changeset 495531 a1b4d7d712ed22355b7967b189166d1b3e99b103
parent 495530 6f52e3faa07ac606474f19de1422fc8fd305f33c
child 495532 a1fc734c080fa60eb7da39941c56e9fb18e68f78
push id9984
push userffxbld-merge
push dateMon, 15 Oct 2018 21:07:35 +0000
treeherdermozilla-beta@183d27ea8570 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmtabara
bugs1496090
milestone64.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 1496090 - mozapkpublisher: Do not call version specific URLs anymore r=mtabara Backed out changeset bc805cf0e6c5 Differential Revision: https://phabricator.services.mozilla.com/D7695
taskcluster/ci/google-play-strings/kind.yml
taskcluster/taskgraph/transforms/google_play_strings.py
--- a/taskcluster/ci/google-play-strings/kind.yml
+++ b/taskcluster/ci/google-play-strings/kind.yml
@@ -32,33 +32,23 @@ jobs:
          env:
             # TODO Use the branch name instead of the android package name
             PACKAGE_NAME:
                by-project:
                   mozilla-central: org.mozilla.fennec_aurora
                   mozilla-beta: org.mozilla.firefox_beta
                   mozilla-release: org.mozilla.firefox
                   default: org.mozilla.fennec_aurora  # Fetches strings for mozilla-central
-            MAJOR_VERSION_NUMBER:
-               by-project:
-                  # Specifying major version allows get_l10n_strings.py to download the correct
-                  # "whatsnew" section in Fennec RCs. We don't specify it in mozilla-beta because
-                  # strings may not be ready at the time of the first Fennec beta.
-                  mozilla-release: "{major_version}"
-                  # Will be unset by transform if empty
-                  default: ''
-
             # XXX The folder depends on the one defined in the Dockerfile
             GOOGLE_PLAY_STRING_FILE: /builds/worker/google_play_strings.json
          command:
             - bash
             - -cx
             - >
               python3 ./mozapkpublisher/get_l10n_strings.py
               --package-name "${PACKAGE_NAME}"
               --output-file "${GOOGLE_PLAY_STRING_FILE}"
-              ${MAJOR_VERSION_NUMBER+--major-version-number ${MAJOR_VERSION_NUMBER}}
       treeherder:
          symbol: pub(gps)
          platform: Android/opt
          tier: 2
          kind: other
       run-on-projects: ['maple', 'mozilla-central', 'mozilla-beta', 'mozilla-release']
--- a/taskcluster/taskgraph/transforms/google_play_strings.py
+++ b/taskcluster/taskgraph/transforms/google_play_strings.py
@@ -5,17 +5,16 @@
 Transform the push-apk kind into an actual task description.
 """
 
 from __future__ import absolute_import, print_function, unicode_literals
 
 from taskgraph.transforms.base import TransformSequence
 from taskgraph.transforms.task import task_description_schema
 from taskgraph.util.schema import resolve_keyed_by, Schema, validate_schema
-from taskgraph.util.scriptworker import get_release_config
 
 from voluptuous import Required
 
 
 transforms = TransformSequence()
 
 # Voluptuous uses marker objects as dictionary *keys*, but they are not
 # comparable, so we cast all of the keys back to regular strings
@@ -53,22 +52,9 @@ def set_worker_data(config, jobs):
         worker = job['worker']
 
         env = worker.setdefault('env', {})
         resolve_keyed_by(
             env, 'PACKAGE_NAME', item_name=job['name'],
             project=config.params['project']
         )
 
-        resolve_keyed_by(
-            env, 'MAJOR_VERSION_NUMBER', item_name=job['name'],
-            project=config.params['project']
-        )
-        if env.get('MAJOR_VERSION_NUMBER'):
-            release_config = get_release_config(config)
-            major_version = release_config['version'].split('.')[0]
-            env['MAJOR_VERSION_NUMBER'] = env['MAJOR_VERSION_NUMBER'].format(
-                major_version=major_version
-            )
-        else:
-            del env['MAJOR_VERSION_NUMBER']
-
         yield job