diff --git a/testing/mozharness/configs/partner_repacks/release_mozilla-esr52_desktop.py b/testing/mozharness/configs/partner_repacks/release_mozilla-esr52_desktop.py index c4c6a97c90e6..8c1b21a26fa4 100644 --- a/testing/mozharness/configs/partner_repacks/release_mozilla-esr52_desktop.py +++ b/testing/mozharness/configs/partner_repacks/release_mozilla-esr52_desktop.py @@ -3,4 +3,5 @@ config = { "log_name": "partner_repack", "repack_manifests_url": "git@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", } diff --git a/testing/mozharness/configs/partner_repacks/release_mozilla-release_desktop.py b/testing/mozharness/configs/partner_repacks/release_mozilla-release_desktop.py index 229c2bb44108..290574c8a6b3 100644 --- a/testing/mozharness/configs/partner_repacks/release_mozilla-release_desktop.py +++ b/testing/mozharness/configs/partner_repacks/release_mozilla-release_desktop.py @@ -3,4 +3,5 @@ config = { "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", } diff --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 index 229c2bb44108..290574c8a6b3 100644 --- a/testing/mozharness/configs/partner_repacks/staging_release_mozilla-release_desktop.py +++ b/testing/mozharness/configs/partner_repacks/staging_release_mozilla-release_desktop.py @@ -3,4 +3,5 @@ config = { "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", } diff --git a/testing/mozharness/scripts/desktop_partner_repacks.py b/testing/mozharness/scripts/desktop_partner_repacks.py index f21251954a7f..91fbd4cc7dc3 100755 --- a/testing/mozharness/scripts/desktop_partner_repacks.py +++ b/testing/mozharness/scripts/desktop_partner_repacks.py @@ -109,7 +109,7 @@ class DesktopPartnerRepacks(ReleaseMixin, BuildbotMixin, PurgeMixin, 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) @@ -120,6 +120,8 @@ class DesktopPartnerRepacks(ReleaseMixin, BuildbotMixin, PurgeMixin, 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.") @@ -148,6 +150,7 @@ class DesktopPartnerRepacks(ReleaseMixin, BuildbotMixin, PurgeMixin, 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: