Rename work_dir/git to work_dir/src
This is step one towards supporting GOPATH natively. With this, one can
set GOPATH={work_dir} and go will find src that we've already checked
out, and will put artifacts in a sibling dir to src that is in the
GOPATH. We'll follow this up with putting the repos into
{src_dir}/{connection}/{full_repo} - such as
"git.openstack.org/openstack-infra/zuul"
Change-Id: I5acefd212587d18d0d3cc4ccd436555734e56e63
diff --git a/tests/base.py b/tests/base.py
index 8802cfd..3ccc872 100755
--- a/tests/base.py
+++ b/tests/base.py
@@ -650,7 +650,7 @@
"""
for change in changes:
- path = os.path.join(self.jobdir.git_root, change.project)
+ path = os.path.join(self.jobdir.src_root, change.project)
try:
repo = git.Repo(path)
except NoSuchPathError as e:
@@ -1211,8 +1211,8 @@
tmp_root = os.environ.get("ZUUL_TEST_ROOT")
self.test_root = os.path.join(tmp_root, "zuul-test")
self.upstream_root = os.path.join(self.test_root, "upstream")
- self.merger_git_root = os.path.join(self.test_root, "merger-git")
- self.launcher_git_root = os.path.join(self.test_root, "launcher-git")
+ self.merger_src_root = os.path.join(self.test_root, "merger-git")
+ self.launcher_src_root = os.path.join(self.test_root, "launcher-git")
self.state_root = os.path.join(self.test_root, "lib")
if os.path.exists(self.test_root):
@@ -1226,8 +1226,8 @@
self.config.set('zuul', 'tenant_config',
os.path.join(FIXTURE_DIR,
self.config.get('zuul', 'tenant_config')))
- self.config.set('merger', 'git_dir', self.merger_git_root)
- self.config.set('launcher', 'git_dir', self.launcher_git_root)
+ self.config.set('merger', 'git_dir', self.merger_src_root)
+ self.config.set('launcher', 'git_dir', self.launcher_src_root)
self.config.set('zuul', 'state_dir', self.state_root)
# For each project in config: