diff options
| author | Zuul <zuul@review.opendev.org> | 2022-08-24 07:12:31 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2022-08-24 07:12:31 +0000 |
| commit | adadc0bdd72d98adb8896f46cf575765b5b2e874 (patch) | |
| tree | cf44726b2887ad85730507b7e45a862d0a4a9cfe | |
| parent | ccad41261995b04da240589a3308b4969d6fe44a (diff) | |
| parent | a97d9f594eb2e284d4a3592a6e987bd152fa1efc (diff) | |
| download | zuul-adadc0bdd72d98adb8896f46cf575765b5b2e874.tar.gz | |
Merge "Set remote URL after config was updated"
| -rw-r--r-- | zuul/merger/merger.py | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/zuul/merger/merger.py b/zuul/merger/merger.py index c3e20e21b..34b495fcc 100644 --- a/zuul/merger/merger.py +++ b/zuul/merger/merger.py @@ -733,10 +733,8 @@ class Repo(object): return log = get_annotated_logger(self.log, zuul_event_id) log.debug("Set remote url to %s", redact_url(url)) + self._git_set_remote_url(self.createRepoObject(zuul_event_id), url) self.remote_url = url - self._git_set_remote_url( - self.createRepoObject(zuul_event_id), - self.remote_url) def mapLine(self, commit, filename, lineno, zuul_event_id=None): repo = self.createRepoObject(zuul_event_id) @@ -1244,11 +1242,13 @@ class Merger(object): item['connection'], item['project'], repo_state, item['ref'], item['newrev']) item = items[-1] - repo = self.getRepo(item['connection'], item['project']) # A list of branch names the last item appears in. item_in_branches = [] if item.get('newrev'): - item_in_branches = repo.contains(item['newrev']) + lock = repo_locks.getRepoLock(item['connection'], item['project']) + with lock: + repo = self.getRepo(item['connection'], item['project']) + item_in_branches = repo.contains(item['newrev']) return (True, repo_state, item_in_branches) def getFiles(self, connection_name, project_name, branch, files, dirs=[]): |