Bug 1275777 - Stop using HgtoolVCS in SpiderMonkey builds; r=jlund
authorGregory Szorc <gps@mozilla.com>
Wed, 18 May 2016 16:06:23 -0700
changeset 338207 7092af4d5f2dd5424dd42ce0b23ee3a71c2bd3fd
parent 338206 2555e6b571f37b4a2315339858af46ac0c0713a2
child 338208 266983e523325fea16101e27030c3d7540d8a5be
push id6249
push userjlund@mozilla.com
push dateMon, 01 Aug 2016 13:59:36 +0000
treeherdermozilla-beta@bad9d4f5bf7e [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersjlund
bugs1275777
milestone49.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 1275777 - Stop using HgtoolVCS in SpiderMonkey builds; r=jlund We remove the old config settings related to hgtool and switch the "revision" option to "branch" because it defines a symbolic revision. MozReview-Commit-ID: Eq4R5a2tv2V
testing/mozharness/configs/users/sfink/spidermonkey.py
testing/mozharness/scripts/spidermonkey_build.py
--- a/testing/mozharness/configs/users/sfink/spidermonkey.py
+++ b/testing/mozharness/configs/users/sfink/spidermonkey.py
@@ -2,32 +2,28 @@
 # the values that would otherwise be provided by buildbot.
 
 BRANCH = "local-src"
 HOME = "/home/sfink"
 REPO = HOME + "/src/MI-GC"
 
 config = {
     "hgurl": "https://hg.mozilla.org/",
-    "hgtool_base_bundle_urls": [
-        "https://ftp-ssl.mozilla.org/pub/mozilla.org/firefox/bundles"
-    ],
-
     "python": "python",
     "sixgill": HOME + "/src/sixgill",
     "sixgill_bin": HOME + "/src/sixgill/bin",
 
     "repo": REPO,
     "repos": [{
         "repo": REPO,
-        "revision": "default",
+        "branch": "default",
         "dest": BRANCH,
     }, {
         "repo": "https://hg.mozilla.org/build/tools",
-        "revision": "default",
+        "branch": "default",
         "dest": "tools"
     }],
 
     "tools_dir": "/tools",
 
     "mock_target": "mozilla-centos6-x86_64",
 
     "upload_remote_basepath": "/tmp/upload-base",
--- a/testing/mozharness/scripts/spidermonkey_build.py
+++ b/testing/mozharness/scripts/spidermonkey_build.py
@@ -116,17 +116,17 @@ class SpidermonkeyBuild(MockMixin,
                 'setup-analysis',
                 'run-analysis',
                 'collect-analysis-output',
                 # Temporarily disabled, see bug 1211402
                 # 'upload-analysis',
                 'check-expectations',
             ],
             config={
-                'default_vcs': 'hgtool',
+                'default_vcs': 'hg',
                 'vcs_share_base': os.environ.get('HG_SHARE_BASE_DIR'),
                 'ccache': True,
                 'buildbot_json_path': os.environ.get('PROPERTIES_FILE'),
                 'tools_repo': 'https://hg.mozilla.org/build/tools',
 
                 'upload_ssh_server': None,
                 'upload_remote_basepath': None,
                 'enable_try_uploads': True,
@@ -145,18 +145,16 @@ class SpidermonkeyBuild(MockMixin,
         super(SpidermonkeyBuild, self)._pre_config_lock(rw_config)
 
         if self.buildbot_config is None:
             self.info("Reading buildbot build properties...")
             self.read_buildbot_config()
 
         if self.buildbot_config:
             bb_props = [('mock_target', 'mock_target', None),
-                        ('base_bundle_urls', 'hgtool_base_bundle_urls', None),
-                        ('base_mirror_urls', 'hgtool_base_mirror_urls', None),
                         ('hgurl', 'hgurl', None),
                         ('clobberer_url', 'clobberer_url', 'https://api.pub.build.mozilla.org/clobberer/lastclobber'),
                         ('force_clobber', 'force_clobber', None),
                         ('branch', 'blob_upload_branch', None),
                         ]
             buildbot_props = self.buildbot_config.get('properties', {})
             for bb_prop, cfg_prop, default in bb_props:
                 if not self.config.get(cfg_prop) and buildbot_props.get(bb_prop, default):
@@ -357,17 +355,17 @@ class SpidermonkeyBuild(MockMixin,
         # If running from within a directory also passed as the --source dir,
         # this has the danger of clobbering <source>/tools/
         if self.config['source']:
             srcdir = self.config['source']
             if os.path.samefile(srcdir, os.path.dirname(dirs['abs_tools_dir'])):
                 raise Exception("Cannot run from source checkout to avoid overwriting subdirs")
 
         rev = self.vcs_checkout(
-            vcs='hg',  # Don't have hgtool.py yet
+            vcs='hg',
             repo=self.config['tools_repo'],
             clean=False,
             dest=dirs['abs_tools_dir'],
         )
         self.set_buildbot_property("tools_revision", rev, write_to_file=True)
 
     def do_checkout_source(self):
         # --source option means to use an existing source directory instead of checking one out.