Backed out 2 changesets (bug 1342392) for bustage a=backout

Backed out changeset b0e86286b173 (bug 1342392)
Backed out changeset 01bf0c29331e (bug 1342392)

MozReview-Commit-ID: 71fcOZ2RgEp

--HG--
rename : taskcluster/docker/partial-update-generator/Dockerfile => taskcluster/docker/funsize-update-generator/Dockerfile
rename : taskcluster/docker/partial-update-generator/Makefile => taskcluster/docker/funsize-update-generator/Makefile
rename : taskcluster/docker/partial-update-generator/README => taskcluster/docker/funsize-update-generator/README
rename : taskcluster/docker/partial-update-generator/dep.pubkey => taskcluster/docker/funsize-update-generator/dep.pubkey
rename : taskcluster/docker/partial-update-generator/nightly_sha1.pubkey => taskcluster/docker/funsize-update-generator/nightly_sha1.pubkey
rename : taskcluster/docker/partial-update-generator/nightly_sha384.pubkey => taskcluster/docker/funsize-update-generator/nightly_sha384.pubkey
rename : taskcluster/docker/partial-update-generator/release_sha1.pubkey => taskcluster/docker/funsize-update-generator/release_sha1.pubkey
rename : taskcluster/docker/partial-update-generator/release_sha384.pubkey => taskcluster/docker/funsize-update-generator/release_sha384.pubkey
rename : taskcluster/docker/partial-update-generator/requirements.txt => taskcluster/docker/funsize-update-generator/requirements.txt
rename : taskcluster/docker/partial-update-generator/runme.sh => taskcluster/docker/funsize-update-generator/runme.sh
rename : taskcluster/docker/partial-update-generator/scripts/funsize.py => taskcluster/docker/funsize-update-generator/scripts/funsize.py
rename : taskcluster/docker/partial-update-generator/scripts/mbsdiff_hook.sh => taskcluster/docker/funsize-update-generator/scripts/mbsdiff_hook.sh

.taskcluster.yml

@@ -1,4 +1,4 @@
--# This file is rendered via JSON-e by
+# This file is rendered via JSON-e by
 # - mozilla-taskcluster - https://docs.taskcluster.net/reference/integrations/mozilla-taskcluster/docs/taskcluster-yml
 # - cron tasks - taskcluster/taskgraph/cron/decision.py
 version: 1
@@ -88,7 +88,7 @@ tasks:
       # scriptworker patch!
       image: 'taskcluster/decision:2.0.0@sha256:4039fd878e5700b326d4a636e28c595c053fbcb53909c1db84ad1f513cf644ef'
 
-      maxRunTime: 2400
+      maxRunTime: 1800
 
       # TODO use mozilla-unified for the base repository once the tc-vcs
       # tar.gz archives are created or tc-vcs isn't being used.

taskcluster/ci/balrog/kind.yml

@@ -13,7 +13,6 @@ kind-dependencies:
   - beetmover
   - beetmover-l10n
   - beetmover-repackage
-  - beetmover-partials
 
 only-for-attributes:
   - nightly

taskcluster/ci/docker-image/kind.yml

@@ -26,5 +26,3 @@ jobs:
     symbol: I(agb)
   index-task:
     symbol: I(idx)
-  partial-update-generator:
-    symbol: I(pg)

taskcluster/docker/partial-update-generator/Dockerfile → taskcluster/docker/funsize-update-generator/Dockerfile

@@ -25,7 +25,6 @@ RUN pip install -r /tmp/requirements.txt
 # scripts
 RUN mkdir /home/worker/bin
 COPY scripts/* /home/worker/bin/
-
 COPY runme.sh /runme.sh
 RUN chmod 755 /home/worker/bin/* /runme.sh
 RUN mkdir /home/worker/keys
@@ -35,5 +34,3 @@ ENV           HOME          /home/worker
 ENV           SHELL         /bin/bash
 ENV           USER          worker
 ENV           LOGNAME       worker
-
-CMD ["/runme.sh"]

taskcluster/docker/partial-update-generator/scripts/funsize.py → taskcluster/docker/funsize-update-generator/scripts/funsize.py

@@ -27,7 +27,6 @@
     "http://ftp.mozilla.org/",
     "http://download.mozilla.org/",
     "https://archive.mozilla.org/",
-    "https://queue.taskcluster.net/v1/task/",
 ]
 
 DEFAULT_FILENAME_TEMPLATE = "{appName}-{branch}-{version}-{platform}-" \
@@ -287,11 +286,7 @@ def main():
         # if branch not set explicitly use repo-name
         mar_data["branch"] = e.get("branch",
                                    mar_data["repo"].rstrip("/").split("/")[-1])
-        if 'dest_mar' in e:
-            mar_name = e['dest_mar']
-        else:
-            # default to formatted name if not specified
-            mar_name = args.filename_template.format(**mar_data)
+        mar_name = args.filename_template.format(**mar_data)
         mar_data["mar"] = mar_name
         dest_mar = os.path.join(work_env.workdir, mar_name)
         # TODO: download these once

taskcluster/docs/kinds.rst

@@ -193,14 +193,6 @@ Beetmover-repackage is beetmover but for tasks that need an intermediate step
 between signing and packaging, such as OSX. For more details see the definitions
 of the Beetmover kind above and the repackage kind below.
 
-beetmover-partials
-------------------
-
-Beetmover-partials is beetmover but for the partial updates that have been
-generated. Not every build produces partial updates, and so these are kept
-separate from the regular beetmover jobs to avoid situations where the completes
-are not uploaded.
-
 checksums-signing
 -----------------
 Checksums-signing take as input the checksums file generated by beetmover tasks
@@ -241,13 +233,3 @@ repackage-signing
 -----------------
 Repackage-signing take the repackaged installers (windows) and update packaging (with
 the signed internal bits) and signs them.
-
-partials
---------
-Partials takes the complete.mar files produced in previous tasks and generates partial
-updates between previous nightly releases and the new one. Requires a release_history
-in the parameters. See ``mach release-history`` if doing this manually.
-
-partials-signing
-----------------
-Partials-signing takes the partial updates produced in Partials and signs them.

taskcluster/docs/parameters.rst

@@ -107,12 +107,6 @@ syntax or reading a project-specific configuration file).
 ``include_nightly``
     If true, then nightly tasks are eligible for optimization.
 
-``release_history``
-   History of recent releases by platform and locale, used when generating
-   partial updates for nightly releases.
-   Suitable contents can be generated with ``mach release-history``,
-   which will print to the console by default.
-
 Morphed Set
 -----------
 

taskcluster/mach_commands.py

@@ -504,23 +504,3 @@ def build_image(self, image_name, context_only):
         except Exception:
             traceback.print_exc()
             sys.exit(1)
-
-
-@CommandProvider
-class TaskClusterPartialsData(object):
-    @Command('release-history', category="ci",
-             description="Query balrog for release history used by enable partials generation")
-    @CommandArgument('-b', '--branch',
-                     help="The gecko project branch used in balrog, such as "
-                          "mozilla-central, release, date")
-    @CommandArgument('--product', default='Firefox',
-                     help="The product identifier, such as 'Firefox'")
-    def generate_partials_builds(self, product, branch):
-        from taskgraph.util.partials import populate_release_history
-        try:
-            import yaml
-            release_history = {'release_history': populate_release_history(product, branch)}
-            print(yaml.safe_dump(release_history, allow_unicode=True, default_flow_style=False))
-        except Exception:
-            traceback.print_exc()
-            sys.exit(1)

taskcluster/taskgraph/decision.py

@@ -18,7 +18,6 @@
 from .parameters import Parameters
 from .taskgraph import TaskGraph
 from .actions import render_actions_json
-from taskgraph.util.partials import populate_release_history
 from . import GECKO
 
 from taskgraph.util.templates import Templates
@@ -108,7 +107,6 @@ def taskgraph_decision(options):
     """
 
     parameters = get_decision_parameters(options)
-
     # create a TaskGraphGenerator instance
     tgg = TaskGraphGenerator(
         root_dir=options['root'],
@@ -204,13 +202,6 @@ def get_decision_parameters(options):
     if options.get('target_tasks_method'):
         parameters['target_tasks_method'] = options['target_tasks_method']
 
-    # If the target method is nightly, we should build partials. This means
-    # knowing what has been released previously.
-    # An empty release_history is fine, it just means no partials will be built
-    parameters.setdefault('release_history', dict())
-    if 'nightly' in parameters.get('target_tasks_method', ''):
-        parameters['release_history'] = populate_release_history('Firefox', project)
-
     return Parameters(parameters)
 
 

taskcluster/taskgraph/parameters.py

@@ -28,7 +28,6 @@
     'project',
     'pushdate',
     'pushlog_id',
-    'release_history',
     'target_task_labels',
     'target_tasks_method',
 ])

taskcluster/taskgraph/transforms/balrog.py

@@ -56,7 +56,7 @@ def make_task_description(config, jobs):
         dep_job = job['dependent-task']
 
         treeherder = job.get('treeherder', {})
-        treeherder.setdefault('symbol', 'c-Up(N)')
+        treeherder.setdefault('symbol', 'tc-Up(N)')
         dep_th_platform = dep_job.task.get('extra', {}).get(
             'treeherder', {}).get('machine', {}).get('platform', '')
         treeherder.setdefault('platform',
@@ -66,18 +66,11 @@ def make_task_description(config, jobs):
 
         attributes = copy_attributes_from_dependent_job(dep_job)
 
-        treeherder_job_symbol = dep_job.attributes.get('locale', 'N')
-
         if dep_job.attributes.get('locale'):
-            treeherder['symbol'] = 'c-Up({})'.format(treeherder_job_symbol)
+            treeherder['symbol'] = 'tc-Up({})'.format(dep_job.attributes.get('locale'))
             attributes['locale'] = dep_job.attributes.get('locale')
 
         label = job['label']
-        if 'partials' in dep_job.kind:
-            label = "partials-{}".format(label)
-            treeherder['symbol'] = 'cp-Up({})'.format(treeherder_job_symbol)
-            treeherder['tier'] = 3  # remove once proven stable
-
         description = (
             "Balrog submission for locale '{locale}' for build '"
             "{build_platform}/{build_type}'".format(
@@ -101,6 +94,7 @@ def make_task_description(config, jobs):
         task = {
             'label': label,
             'description': description,
+            # do we have to define worker type somewhere?
             'worker-type': 'scriptworker-prov-v1/balrogworker-v1',
             'worker': {
                 'implementation': 'balrog',

taskcluster/taskgraph/transforms/beetmover_repackage.py

@@ -215,14 +215,6 @@ def make_task_description(config, jobs):
                                   }
         dependencies.update(repackage_dependencies)
 
-        # If this isn't a direct dependency, it won't be in there.
-        if 'repackage-signing' not in dependencies:
-            repackage_signing_name = "repackage-signing"
-            repackage_signing_deps = {"repackage-signing":
-                                      dep_job.dependencies[repackage_signing_name]
-                                      }
-            dependencies.update(repackage_signing_deps)
-
         attributes = copy_attributes_from_dependent_job(dep_job)
         if job.get('locale'):
             attributes['locale'] = job['locale']
@@ -281,6 +273,7 @@ def generate_upstream_artifacts(build_task_ref, build_signing_task_ref,
                 _check_platform_matched_only_one_regex(
                     tasktype, platform, plarform_was_previously_matched_by_regex, platform_regex
                 )
+
                 upstream_artifacts.append({
                     "taskId": {"task-reference": ref},
                     "taskType": tasktype,
@@ -306,12 +299,8 @@ def _check_platform_matched_only_one_regex(
 
 
 def is_valid_beetmover_job(job):
-    # beetmover after partials-signing should have six dependencies.
-    # windows builds w/o partials don't have docker-image, so fewer
-    # dependencies
-    if 'partials-signing' in job['dependencies'].keys():
-        expected_dep_count = 6
-    elif any(b in job['attributes']['build_platform'] for b in _WINDOWS_BUILD_PLATFORMS):
+    # windows builds don't have docker-image, so fewer dependencies
+    if any(b in job['attributes']['build_platform'] for b in _WINDOWS_BUILD_PLATFORMS):
         expected_dep_count = 4
     else:
         expected_dep_count = 5
@@ -332,7 +321,6 @@ def make_task_worker(config, jobs):
         build_signing_task = None
         repackage_task = None
         repackage_signing_task = None
-
         for dependency in job["dependencies"].keys():
             if 'repackage-signing' in dependency:
                 repackage_signing_task = dependency