Use the executor cached repos more often
Currently, we clone the job's working repos from the repo cache that
the executor maintains. However, some playbook and role repos do
not use that cache.
To facilitate more operations using the merger class, add the concept
of a repo cache to it, and use that in all job related git repo operations
on the executor.
Change-Id: I747b6602540458506e1f6d480a95b80c6543c5a8
diff --git a/tests/base.py b/tests/base.py
index a9bcee1..d229604 100755
--- a/tests/base.py
+++ b/tests/base.py
@@ -1189,10 +1189,10 @@
class RecordingAnsibleJob(zuul.executor.server.AnsibleJob):
- def doMergeChanges(self, items, repo_state):
+ def doMergeChanges(self, merger, items, repo_state):
# Get a merger in order to update the repos involved in this job.
commit = super(RecordingAnsibleJob, self).doMergeChanges(
- items, repo_state)
+ merger, items, repo_state)
if not commit: # merge conflict
self.recordResult('MERGER_FAILURE')
return commit