Bug 1435638 - initialize repo using an ssh clone, r=jlund a=release DONTBUILD FIREFOX_RELEASE_58_END
authorNick Thomas <nthomas@mozilla.com>
Fri, 23 Feb 2018 11:27:22 +1300
changeset 445724 23e95bbe4d5553a2ba9dda2a4a96a2029253597c
parent 445723 b74767fc1ed9518eb7a3656965ee7d8bb667111a
child 455075 d8eaf33a80b54a676631c30e086da892a19c5cea
push id1647
push usernthomas@mozilla.com
push dateThu, 22 Feb 2018 23:16:21 +0000
treeherdermozilla-release@23e95bbe4d55 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersjlund, release
bugs1435638
milestone58.0.3
Bug 1435638 - initialize repo using an ssh clone, r=jlund a=release DONTBUILD
testing/mozharness/configs/partner_repacks/release_mozilla-esr52_desktop.py
testing/mozharness/configs/partner_repacks/release_mozilla-release_desktop.py
testing/mozharness/configs/partner_repacks/staging_release_mozilla-release_desktop.py
testing/mozharness/scripts/desktop_partner_repacks.py
--- a/testing/mozharness/configs/partner_repacks/release_mozilla-esr52_desktop.py
+++ b/testing/mozharness/configs/partner_repacks/release_mozilla-esr52_desktop.py
@@ -1,6 +1,7 @@
 config = {
     "appName": "Firefox",
     "log_name": "partner_repack",
     "repack_manifests_url": "https://github.com/mozilla-partners/mozilla-sha1-manifest",
     "repo_file": "https://raw.githubusercontent.com/mozilla/git-repo/master/repo",
+    "repo_url": "git@github.com:mozilla/git-repo.git",
 }
--- a/testing/mozharness/configs/partner_repacks/release_mozilla-release_desktop.py
+++ b/testing/mozharness/configs/partner_repacks/release_mozilla-release_desktop.py
@@ -1,6 +1,7 @@
 config = {
     "appName": "Firefox",
     "log_name": "partner_repack",
     "repack_manifests_url": "git@github.com:mozilla-partners/repack-manifests.git",
     "repo_file": "https://raw.githubusercontent.com/mozilla/git-repo/master/repo",
+    "repo_url": "git@github.com:mozilla/git-repo.git",
 }
--- a/testing/mozharness/configs/partner_repacks/staging_release_mozilla-release_desktop.py
+++ b/testing/mozharness/configs/partner_repacks/staging_release_mozilla-release_desktop.py
@@ -1,6 +1,7 @@
 config = {
     "appName": "Firefox",
     "log_name": "partner_repack",
     "repack_manifests_url": "git@github.com:mozilla-partners/repack-manifests.git",
     "repo_file": "https://raw.githubusercontent.com/mozilla/git-repo/master/repo",
+    "repo_url": "git@github.com:mozilla/git-repo.git",
 }
--- a/testing/mozharness/scripts/desktop_partner_repacks.py
+++ b/testing/mozharness/scripts/desktop_partner_repacks.py
@@ -104,27 +104,29 @@ class DesktopPartnerRepacks(ReleaseMixin
             self.warning("Skipping buildbot properties overrides")
         else:
             if self.config.get('require_buildprops', False) is True:
                 if not self.buildbot_config:
                     self.fatal("Unable to load properties from file: %s" %
                                self.config.get('buildbot_json_path'))
             props = self.buildbot_config["properties"]
             for prop in ['version', 'build_number', 'revision', 'repo_file',
-                         'repack_manifests_url', 'partner']:
+                         'repo_url', 'repack_manifests_url', 'partner']:
                 if props.get(prop):
                     self.info("Overriding %s with %s" % (prop, props[prop]))
                     self.config[prop] = props.get(prop)
 
         if 'version' not in self.config:
             self.fatal("Version (-v) not supplied.")
         if 'build_number' not in self.config:
             self.fatal("Build number (-n) not supplied.")
         if 'repo_file' not in self.config:
             self.fatal("repo_file not supplied.")
+        if 'repo_url' not in self.config:
+            self.fatal("repo_url not supplied.")
         if 'repack_manifests_url' not in self.config:
             self.fatal("repack_manifests_url not supplied.")
 
     def query_abs_dirs(self):
         if self.abs_dirs:
             return self.abs_dirs
         abs_dirs = super(DesktopPartnerRepacks, self).query_abs_dirs()
         for directory in abs_dirs:
@@ -143,16 +145,17 @@ class DesktopPartnerRepacks(ReleaseMixin
     # Actions {{{
     def _repo_cleanup(self):
         self.rmtree(self.query_abs_dirs()['abs_repo_dir'])
         self.rmtree(self.query_abs_dirs()['abs_partners_dir'])
         self.rmtree(self.query_abs_dirs()['abs_scripts_dir'])
 
     def _repo_init(self, repo):
         status = self.run_command([repo, "init", "--no-repo-verify",
+                                   "--repo-url", self.config['repo_url'],
                                    "-u", self.config['repack_manifests_url']],
                                   cwd=self.query_abs_dirs()['abs_work_dir'])
         if status:
             return status
         return self.run_command([repo, "sync"],
                                 cwd=self.query_abs_dirs()['abs_work_dir'])
 
     def setup(self):