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/unit/test_cloner.py b/tests/unit/test_cloner.py
index 2cdc826..02ae910 100644
--- a/tests/unit/test_cloner.py
+++ b/tests/unit/test_cloner.py
@@ -91,7 +91,7 @@
workspace=self.workspace_root,
zuul_branch=build.parameters['ZUUL_BRANCH'],
zuul_ref=build.parameters['ZUUL_REF'],
- zuul_url=self.git_root,
+ zuul_url=self.src_root,
cache_dir=cache_root,
)
cloner.execute()
@@ -149,7 +149,7 @@
workspace=self.workspace_root,
zuul_branch=build.parameters['ZUUL_BRANCH'],
zuul_ref=build.parameters['ZUUL_REF'],
- zuul_url=self.git_root,
+ zuul_url=self.src_root,
)
cloner.execute()
work = self.getWorkspaceRepos(projects)
@@ -219,7 +219,7 @@
workspace=self.workspace_root,
zuul_branch=build.parameters['ZUUL_BRANCH'],
zuul_ref=build.parameters['ZUUL_REF'],
- zuul_url=self.git_root,
+ zuul_url=self.src_root,
)
cloner.execute()
work = self.getWorkspaceRepos(projects)
@@ -333,7 +333,7 @@
workspace=self.workspace_root,
zuul_branch=build.parameters['ZUUL_BRANCH'],
zuul_ref=build.parameters['ZUUL_REF'],
- zuul_url=self.git_root,
+ zuul_url=self.src_root,
branch='stable/havana', # Old branch for upgrade
)
cloner.execute()
@@ -395,7 +395,7 @@
workspace=self.workspace_root,
zuul_branch=build.parameters['ZUUL_BRANCH'],
zuul_ref=build.parameters['ZUUL_REF'],
- zuul_url=self.git_root,
+ zuul_url=self.src_root,
branch='master', # New branch for upgrade
)
cloner.execute()
@@ -481,7 +481,7 @@
workspace=self.workspace_root,
zuul_branch=build.parameters['ZUUL_BRANCH'],
zuul_ref=build.parameters['ZUUL_REF'],
- zuul_url=self.git_root,
+ zuul_url=self.src_root,
project_branches={'org/project4': 'master'},
)
cloner.execute()
@@ -546,7 +546,7 @@
workspace=self.workspace_root,
zuul_branch=build.parameters.get('ZUUL_BRANCH', None),
zuul_ref=build.parameters.get('ZUUL_REF', None),
- zuul_url=self.git_root,
+ zuul_url=self.src_root,
branch='stable/havana',
)
cloner.execute()
@@ -581,7 +581,7 @@
workspace=self.workspace_root,
zuul_branch=None,
zuul_ref='master',
- zuul_url=self.git_root,
+ zuul_url=self.src_root,
zuul_project=project,
zuul_newrev=newRev,
)
@@ -607,7 +607,7 @@
workspace=self.workspace_root,
zuul_branch=None,
zuul_ref='master',
- zuul_url=self.git_root,
+ zuul_url=self.src_root,
zuul_project=project,
zuul_newrev=newRev
)