Replace config/project repos with config/untrusted projects
The config-repo / project-repo terminology is confusing and we've
generally been using trusted-project and untrusted-project instead.
The term "untrusted-project" is straightforward, but "trusted-project"
is a little misleading, since there are other characteristics which
define it (notably, that the configuration held in it is branchless).
A better term for that might be "config-project".
Since the main config now directly refers to projects rather than
repos, complete the transition by replacing all config-repo
occurances with config-project and likewise project-repo with
untrusted-project.
Change-Id: I2341aa94e3622e2647b0506b78bc84dbcdec1901
Story: 2000953
diff --git a/tests/base.py b/tests/base.py
index 78b2ea0..0c033b5 100755
--- a/tests/base.py
+++ b/tests/base.py
@@ -1475,9 +1475,9 @@
for tenant in tenant_config:
sources = tenant['tenant']['source']
for source, conf in sources.items():
- for project in conf.get('config-repos', []):
+ for project in conf.get('config-projects', []):
self.setupProjectKeys(source, project)
- for project in conf.get('project-repos', []):
+ for project in conf.get('untrusted-projects', []):
self.setupProjectKeys(source, project)
def setupProjectKeys(self, source, project):
@@ -1927,9 +1927,9 @@
def getPipeline(self, name):
return self.sched.abide.tenants.values()[0].layout.pipelines.get(name)
- def updateConfigLayout(self, path, project_repos=None):
- if project_repos is None:
- project_repos = []
+ def updateConfigLayout(self, path, untrusted_projects=None):
+ if untrusted_projects is None:
+ untrusted_projects = []
root = os.path.join(self.test_root, "config")
if not os.path.exists(root):
os.makedirs(root)
@@ -1939,9 +1939,9 @@
name: openstack
source:
gerrit:
- config-repos:
+ config-projects:
- %s
- project-repos:
+ untrusted-projects:
- org/project
- org/project1
- org/project2
@@ -1959,7 +1959,7 @@
- org/experimental-project
- org/no-jobs-project\n""" % path)
- for repo in project_repos:
+ for repo in untrusted_projects:
f.write(" - %s\n" % repo)
f.close()
self.config.set('zuul', 'tenant_config',