zuul/zuul
Code Issues Proposed changes

Replace config/project repos with config/untrusted projects

Browse Source 
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
This commit is contained in:
James E. Blair
2017-04-04 14:39:43 -07:00
parent 0ffa010656
commit 109da3f9a7
34 changed files with 148 additions and 148 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
tests/base.py
View File

@@ -1475,9 +1475,9 @@ class ZuulTestCase(BaseTestCase):
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 @@ class ZuulTestCase(BaseTestCase):
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 @@ class ZuulTestCase(BaseTestCase):
name: openstack
source:
gerrit:
config-repos:
config-projects:
- %s
project-repos:
untrusted-projects:
- org/project
- org/project1
- org/project2
@@ -1959,7 +1959,7 @@ class ZuulTestCase(BaseTestCase):
- 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',

4
tests/fixtures/config/ansible/main.yaml vendored
View File

@@ -2,8 +2,8 @@
name: tenant-one
source:
gerrit:
config-repos:
config-projects:
- common-config
project-repos:
untrusted-projects:
- org/project
- bare-role

2
tests/fixtures/config/broken/main.yaml vendored
View File

@@ -2,5 +2,5 @@
name: tenant-one
source:
gerrit:
config-repos:
config-projects:
- common-config

4
tests/fixtures/config/dependency-graph/main.yaml vendored
View File

@@ -2,7 +2,7 @@
name: tenant-one
source:
gerrit:
config-repos:
config-projects:
- common-config
project-repos:
untrusted-projects:
- org/project

4
tests/fixtures/config/duplicate-pipeline/main.yaml vendored
View File

@@ -2,7 +2,7 @@
name: tenant-duplicate
source:
gerrit:
config-repos:
config-projects:
- common-config
project-repos:
untrusted-projects:
- org/project

4
tests/fixtures/config/git-driver/main.yaml vendored
View File

@@ -2,8 +2,8 @@
name: tenant-one
source:
git:
config-repos:
config-projects:
- common-config
gerrit:
project-repos:
untrusted-projects:
- org/project

4
tests/fixtures/config/in-repo/main.yaml vendored
View File

@@ -2,7 +2,7 @@
name: tenant-one
source:
gerrit:
config-repos:
config-projects:
- common-config
project-repos:
untrusted-projects:
- org/project

4
tests/fixtures/config/merges/main.yaml vendored
View File

@@ -2,9 +2,9 @@
name: tenant-one
source:
gerrit:
config-repos:
config-projects:
- common-config
project-repos:
untrusted-projects:
- org/project-cherry-pick
- org/project-merge
- org/project-merge-branches

8
tests/fixtures/config/multi-tenant-semaphore/main.yaml vendored
View File

@@ -2,10 +2,10 @@
name: tenant-one
source:
gerrit:
config-repos:
config-projects:
- common-config
- tenant-one-config
project-repos:
untrusted-projects:
- org/project1
- org/project2
@@ -13,9 +13,9 @@
name: tenant-two
source:
gerrit:
config-repos:
config-projects:
- common-config
- tenant-two-config
project-repos:
untrusted-projects:
- org/project1
- org/project2

8
tests/fixtures/config/multi-tenant/main.yaml vendored
View File

@@ -2,18 +2,18 @@
name: tenant-one
source:
gerrit:
config-repos:
config-projects:
- common-config
- tenant-one-config
project-repos:
untrusted-projects:
- org/project1
- tenant:
name: tenant-two
source:
gerrit:
config-repos:
config-projects:
- common-config
- tenant-two-config
project-repos:
untrusted-projects:
- org/project2

4
tests/fixtures/config/one-job-project/main.yaml vendored
View File

@@ -2,7 +2,7 @@
name: tenant-one
source:
gerrit:
config-repos:
config-projects:
- common-config
project-repos:
untrusted-projects:
- org/one-job-project

4
tests/fixtures/config/openstack/main.yaml vendored
View File

@@ -2,8 +2,8 @@
name: openstack
source:
gerrit:
config-repos:
config-projects:
- project-config
project-repos:
untrusted-projects:
- openstack/nova
- openstack/keystone

4
tests/fixtures/config/requirements/email/main.yaml vendored
View File

@@ -2,8 +2,8 @@
name: tenant-one
source:
gerrit:
config-repos:
config-projects:
- common-config
project-repos:
untrusted-projects:
- org/project1
- org/project2

4
tests/fixtures/config/requirements/newer-than/main.yaml vendored
View File

@@ -2,8 +2,8 @@
name: tenant-one
source:
gerrit:
config-repos:
config-projects:
- common-config
project-repos:
untrusted-projects:
- org/project1
- org/project2

4
tests/fixtures/config/requirements/older-than/main.yaml vendored
View File

@@ -2,8 +2,8 @@
name: tenant-one
source:
gerrit:
config-repos:
config-projects:
- common-config
project-repos:
untrusted-projects:
- org/project1
- org/project2

4
tests/fixtures/config/requirements/reject-username/main.yaml vendored
View File

@@ -2,8 +2,8 @@
name: tenant-one
source:
gerrit:
config-repos:
config-projects:
- common-config
project-repos:
untrusted-projects:
- org/project1
- org/project2

4
tests/fixtures/config/requirements/reject/main.yaml vendored
View File

@@ -2,8 +2,8 @@
name: tenant-one
source:
gerrit:
config-repos:
config-projects:
- common-config
project-repos:
untrusted-projects:
- org/project1
- org/project2

4
tests/fixtures/config/requirements/state/main.yaml vendored
View File

@@ -2,9 +2,9 @@
name: tenant-one
source:
gerrit:
config-repos:
config-projects:
- common-config
project-repos:
untrusted-projects:
- current-project
- open-project
- status-project

4
tests/fixtures/config/requirements/username/main.yaml vendored
View File

@@ -2,8 +2,8 @@
name: tenant-one
source:
gerrit:
config-repos:
config-projects:
- common-config
project-repos:
untrusted-projects:
- org/project1
- org/project2

4
tests/fixtures/config/requirements/vote1/main.yaml vendored
View File

@@ -2,8 +2,8 @@
name: tenant-one
source:
gerrit:
config-repos:
config-projects:
- common-config
project-repos:
untrusted-projects:
- org/project1
- org/project2

4
tests/fixtures/config/requirements/vote2/main.yaml vendored
View File

@@ -2,8 +2,8 @@
name: tenant-one
source:
gerrit:
config-repos:
config-projects:
- common-config
project-repos:
untrusted-projects:
- org/project1
- org/project2

4
tests/fixtures/config/single-tenant/main.yaml vendored
View File

@@ -2,9 +2,9 @@
name: tenant-one
source:
gerrit:
config-repos:
config-projects:
- common-config
project-repos:
untrusted-projects:
- org/project
- org/project1
- org/project2

4
tests/fixtures/config/sql-driver/main.yaml vendored
View File

@@ -2,7 +2,7 @@
name: tenant-one
source:
gerrit:
config-repos:
config-projects:
- common-config
project-repos:
untrusted-projects:
- org/project

4
tests/fixtures/config/success-url/main.yaml vendored
View File

@@ -2,7 +2,7 @@
name: tenant-one
source:
gerrit:
config-repos:
config-projects:
- common-config
project-repos:
untrusted-projects:
- org/docs

4
tests/fixtures/config/templated-project/main.yaml vendored
View File

@@ -2,8 +2,8 @@
name: tenant-one
source:
gerrit:
config-repos:
config-projects:
- common-config
project-repos:
untrusted-projects:
- org/templated-project
- org/layered-project

6
tests/fixtures/config/zuul-connections-multiple-gerrits/main.yaml vendored
View File

@@ -2,10 +2,10 @@
name: tenant-one
source:
review_gerrit:
config-repos:
config-projects:
- common-config
project-repos:
untrusted-projects:
- org/project1
another_gerrit:
project-repos:
untrusted-projects:
- org/project1

4
tests/fixtures/config/zuul-connections-same-gerrit/main.yaml vendored
View File

@@ -2,7 +2,7 @@
name: tenant-one
source:
review_gerrit:
config-repos:
config-projects:
- common-config
project-repos:
untrusted-projects:
- org/project

4
tests/fixtures/config/zuultrigger/parent-change-enqueued/main.yaml vendored
View File

@@ -2,7 +2,7 @@
name: tenant-one
source:
gerrit:
config-repos:
config-projects:
- common-config
project-repos:
untrusted-projects:
- org/project

2
tests/fixtures/config/zuultrigger/project-change-merged/main.yaml vendored
View File

@@ -2,5 +2,5 @@
name: tenant-one
source:
gerrit:
config-repos:
config-projects:
- common-config

8
tests/unit/test_git_driver.py
View File

@@ -27,10 +27,10 @@ class TestGitDriver(ZuulTestCase):
tenant = self.sched.abide.tenants.get('tenant-one')
# Check that we have the git source for common-config and the
# gerrit source for the project.
self.assertEqual('git', tenant.config_repos[0].source.name)
self.assertEqual('common-config', tenant.config_repos[0].name)
self.assertEqual('gerrit', tenant.project_repos[0].source.name)
self.assertEqual('org/project', tenant.project_repos[0].name)
self.assertEqual('git', tenant.config_projects[0].source.name)
self.assertEqual('common-config', tenant.config_projects[0].name)
self.assertEqual('gerrit', tenant.untrusted_projects[0].source.name)
self.assertEqual('org/project', tenant.untrusted_projects[0].name)
# The configuration for this test is accessed via the git
# driver (in common-config), rather than the gerrit driver, so

22
tests/unit/test_model.py
View File

@@ -42,7 +42,7 @@ class TestJob(BaseTestCase):
self.tenant = model.Tenant('tenant')
self.layout = model.Layout()
self.project = model.Project('project', self.source)
self.tenant.addProjectRepo(self.project)
self.tenant.addUntrustedProject(self.project)
self.pipeline = model.Pipeline('gate', self.layout)
self.layout.addPipeline(self.pipeline)
self.queue = model.ChangeQueue(self.pipeline)
@@ -165,7 +165,7 @@ class TestJob(BaseTestCase):
layout.addPipeline(pipeline)
queue = model.ChangeQueue(pipeline)
project = model.Project('project', self.source)
tenant.addProjectRepo(project)
tenant.addUntrustedProject(project)
base = configloader.JobParser.fromYaml(tenant, layout, {
'_source_context': self.context,
@@ -432,7 +432,7 @@ class TestJob(BaseTestCase):
def test_job_inheritance_job_tree(self):
tenant = model.Tenant('tenant')
layout = model.Layout()
tenant.addProjectRepo(self.project)
tenant.addUntrustedProject(self.project)
pipeline = model.Pipeline('gate', layout)
layout.addPipeline(pipeline)
@@ -513,7 +513,7 @@ class TestJob(BaseTestCase):
layout.addPipeline(pipeline)
queue = model.ChangeQueue(pipeline)
project = model.Project('project', self.source)
tenant.addProjectRepo(project)
tenant.addUntrustedProject(project)
base = configloader.JobParser.fromYaml(tenant, layout, {
'_source_context': self.context,
@@ -594,7 +594,7 @@ class TestJob(BaseTestCase):
self.layout.addJob(job)
project2 = model.Project('project2', self.source)
self.tenant.addProjectRepo(project2)
self.tenant.addUntrustedProject(project2)
context2 = model.SourceContext(project2, 'master',
'test', True)
@@ -795,7 +795,7 @@ class TestTenant(BaseTestCase):
connection=connection1)
source1_project1 = model.Project('project1', source1)
tenant.addConfigRepo(source1_project1)
tenant.addConfigProject(source1_project1)
d = {'project1':
{'git1.example.com': source1_project1}}
self.assertEqual(d, tenant.projects)
@@ -805,7 +805,7 @@ class TestTenant(BaseTestCase):
tenant.getProject('git1.example.com/project1'))
source1_project2 = model.Project('project2', source1)
tenant.addProjectRepo(source1_project2)
tenant.addUntrustedProject(source1_project2)
d = {'project1':
{'git1.example.com': source1_project1},
'project2':
@@ -822,7 +822,7 @@ class TestTenant(BaseTestCase):
connection=connection2)
source2_project1 = model.Project('project1', source2)
tenant.addProjectRepo(source2_project1)
tenant.addUntrustedProject(source2_project1)
d = {'project1':
{'git1.example.com': source1_project1,
'git2.example.com': source2_project1},
@@ -841,7 +841,7 @@ class TestTenant(BaseTestCase):
tenant.getProject('git2.example.com/project1'))
source2_project2 = model.Project('project2', source2)
tenant.addConfigRepo(source2_project2)
tenant.addConfigProject(source2_project2)
d = {'project1':
{'git1.example.com': source1_project1,
'git2.example.com': source2_project1},
@@ -867,7 +867,7 @@ class TestTenant(BaseTestCase):
tenant.getProject('git2.example.com/project2'))
source1_project2b = model.Project('subpath/project2', source1)
tenant.addConfigRepo(source1_project2b)
tenant.addConfigProject(source1_project2b)
d = {'project1':
{'git1.example.com': source1_project1,
'git2.example.com': source2_project1},
@@ -888,7 +888,7 @@ class TestTenant(BaseTestCase):
tenant.getProject('git1.example.com/subpath/project2'))
source2_project2b = model.Project('subpath/project2', source2)
tenant.addConfigRepo(source2_project2b)
tenant.addConfigProject(source2_project2b)
d = {'project1':
{'git1.example.com': source1_project1,
'git2.example.com': source2_project1},