Bug 1522144 - fix auth issues in bumping behaviors of mergeduty. r=tomprince a=release
authorMihai Tabara <mtabara@mozilla.com>
Thu, 24 Jan 2019 17:48:23 +0000
changeset 455264 f6659c725cba4ea07980ddc67019792d04df69bf
parent 455263 8efe83c7c8610872bd64f020fad8fc663fb54c2b
child 455265 aa0e9d1e6bd25a60710d5cb13732cd87fdda4f2c
push id111427
push usermtabara@mozilla.com
push dateThu, 24 Jan 2019 17:48:52 +0000
treeherdermozilla-inbound@f6659c725cba [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerstomprince, release
bugs1522144
milestone66.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 1522144 - fix auth issues in bumping behaviors of mergeduty. r=tomprince a=release
testing/mozharness/configs/merge_day/bump_central.py
testing/mozharness/configs/merge_day/bump_esr.py
testing/mozharness/scripts/merge_day/gecko_migration.py
--- a/testing/mozharness/configs/merge_day/bump_central.py
+++ b/testing/mozharness/configs/merge_day/bump_central.py
@@ -23,11 +23,12 @@ config = {
 
     "require_remove_locales": False,
     "requires_head_merge": False,
 
     "migration_behavior": "bump_and_tag_central", # like esr_bump.py, needed for key validation
     "default_actions": [
         "clean-repos",
         "pull",
+        "set_push_to_ssh",
         "bump_and_tag_central"
     ],
 }
--- a/testing/mozharness/configs/merge_day/bump_esr.py
+++ b/testing/mozharness/configs/merge_day/bump_esr.py
@@ -14,11 +14,12 @@ config = {
     "to_repo_url": "https://hg.mozilla.org/releases/mozilla-esr60",
 
     "migration_behavior": "bump_second_digit",
     "require_remove_locales": False,
     "requires_head_merge": False,
     "default_actions": [
         "clean-repos",
         "pull",
+        "set_push_to_ssh",
         "bump_second_digit"
     ],
 }
--- a/testing/mozharness/scripts/merge_day/gecko_migration.py
+++ b/testing/mozharness/scripts/merge_day/gecko_migration.py
@@ -171,17 +171,18 @@ class GeckoMigration(MercurialScript, Vi
     def query_push_args(self, cwd):
         if cwd == self.query_abs_dirs()['abs_to_dir'] and \
                 self.config['migration_behavior'] == 'beta_to_release':
             return ['--new-branch', '-r', '.']
         else:
             return ['-r', '.']
 
     def set_push_to_ssh(self):
-        for cwd in self.query_push_dirs():
+        push_dirs = [d for d in self.query_push_dirs() if d is not None]
+        for cwd in push_dirs:
             repo_url = self.read_repo_hg_rc(cwd).get('paths', 'default')
             username = self.config.get('ssh_user', '')
             # Add a trailing @ to the username if it exists, otherwise it gets
             # mushed up with the hostname.
             if username:
                 username += '@'
             push_dest = repo_url.replace('https://', 'ssh://' + username)