Bug 1187706 part 2: Cleanup mozharness stuff. r=garndt
authorWander Lairson Costa <wcosta@mozilla.com>
Sun, 26 Jul 2015 15:58:57 -0300
changeset 286386 9a290ce57a780a03ccfbb89bd0dfa88d424ebb68
parent 286385 19002d887cb41b9c777e6c53c7cf017f30bd0505
child 286387 0c4e711effd273638e9cab42f7a522ad368c97eb
push id5067
push userraliiev@mozilla.com
push dateMon, 21 Sep 2015 14:04:52 +0000
treeherdermozilla-beta@14221ffe5b2f [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersgarndt
bugs1187706
milestone42.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 1187706 part 2: Cleanup mozharness stuff. r=garndt Now that mozharness is in tree, we don't need references to mozharness repositories and revisions. We don't cleanup all mozharness stuff because android and desktop builds still references external mozharness.
testing/taskcluster/mach_commands.py
testing/taskcluster/tasks/phone_build.yml
--- a/testing/taskcluster/mach_commands.py
+++ b/testing/taskcluster/mach_commands.py
@@ -445,20 +445,16 @@ class CIBuild(object):
     @CommandArgument('--head-repository',
         required=True,
         help='URL for "head" repository to fetch revision from')
     @CommandArgument('--head-ref',
         help='Reference (this is same as rev usually for hg)')
     @CommandArgument('--head-rev',
         required=True,
         help='Commit revision to use')
-    @CommandArgument('--mozharness-repository',
-        help='URL for custom mozharness repo')
-    @CommandArgument('--mozharness-rev',
-        help='Commit revision to use from mozharness repository')
     @CommandArgument('--owner',
         default='foobar@mozilla.com',
         help='email address of who owns this graph')
     @CommandArgument('build_task',
         help='path to build task definition')
     def create_ci_build(self, **params):
         from taskcluster_graph.templates import Templates
         import taskcluster_graph.build_task
@@ -470,42 +466,29 @@ class CIBuild(object):
             head_repository = get_hg_url()
 
         head_rev = params['head_rev']
         if not head_rev:
             head_rev = get_latest_hg_revision(head_repository)
 
         head_ref = params['head_ref'] or head_rev
 
-        mozharness = load_mozharness_info()
-
-        mozharness_repo = params['mozharness_repository']
-        if mozharness_repo is None:
-            mozharness_repo = mozharness['repo']
-
-        mozharness_rev = params['mozharness_rev']
-        if mozharness_rev is None:
-            mozharness_rev = mozharness['revision']
-
         from taskcluster_graph.from_now import (
             json_time_from_now,
             current_json_time,
         )
         build_parameters = dict(gaia_info().items() + {
             'docker_image': docker_image,
             'owner': params['owner'],
             'from_now': json_time_from_now,
             'now': current_json_time(),
             'base_repository': params['base_repository'] or head_repository,
             'head_repository': head_repository,
             'head_rev': head_rev,
             'head_ref': head_ref,
-            'mozharness_repository': mozharness_repo,
-            'mozharness_ref': mozharness_rev,
-            'mozharness_rev': mozharness_rev
         }.items())
 
         try:
             build_task = templates.load(params['build_task'], build_parameters)
         except IOError:
             sys.stderr.write(
                 "Could not load build task file.  Ensure path is a relative " \
                 "path from testing/taskcluster"
--- a/testing/taskcluster/tasks/phone_build.yml
+++ b/testing/taskcluster/tasks/phone_build.yml
@@ -49,19 +49,16 @@ task:
 
 
     env:
       # Common environment variables for checking out gecko
       GECKO_BASE_REPOSITORY: '{{base_repository}}'
       GECKO_HEAD_REPOSITORY: '{{head_repository}}'
       GECKO_HEAD_REV: '{{head_rev}}'
       GECKO_HEAD_REF: '{{head_ref}}'
-      MOZHARNESS_REPOSITORY: '{{mozharness_repository}}'
-      MOZHARNESS_REV: '{{mozharness_rev}}'
-      MOZHARNESS_REF: '{{mozharness_ref}}'
 
   extra:
     index:
       rank: {{pushlog_id}}
     treeherder:
       groupSymbol: tc
       groupName: Submitted by taskcluster
       symbol: B