zuul
/
zuul
Code Issues Proposed changes

Merge "Always create foreign projects if needed"

This commit is contained in:
Jenkins 2016-08-26 02:17:54 +00:00 committed by Gerrit Code Review
parent 30f2b29874 a8b90b3809
commit cbc7f627ca
3 changed files with 22 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
tests/test_scheduler.py
View File

@ -4267,6 +4267,25 @@ For CI problems and help debugging, contact ci@example.org"""
self.waitUntilSettled()
self.assertEqual(self.history[-1].changes, '3,2 2,1 1,2')
def test_crd_check_unknown(self):
"Test unknown projects in independent pipeline"
self.init_repo("org/unknown")
A = self.fake_gerrit.addFakeChange('org/project1', 'master', 'A')
B = self.fake_gerrit.addFakeChange('org/unknown', 'master', 'D')
# A Depends-On: B
A.data['commitMessage'] = '%s\n\nDepends-On: %s\n' % (
A.subject, B.data['id'])
# Make sure zuul has seen an event on B.
self.fake_gerrit.addEvent(B.getPatchsetCreatedEvent(1))
self.fake_gerrit.addEvent(A.getPatchsetCreatedEvent(1))
self.waitUntilSettled()
self.assertEqual(A.data['status'], 'NEW')
self.assertEqual(A.reported, 1)
self.assertEqual(B.data['status'], 'NEW')
self.assertEqual(B.reported, 0)
def test_crd_cycle_join(self):
"Test an updated change creates a cycle"
A = self.fake_gerrit.addFakeChange('org/project2', 'master', 'A')

4
zuul/scheduler.py
View File

@ -625,12 +625,12 @@ class Scheduler(threading.Thread):
def setMerger(self, merger):
self.merger = merger
def getProject(self, name, create_foreign=False):
def getProject(self, name):
self.layout_lock.acquire()
p = None
try:
p = self.layout.projects.get(name)
if p is None and create_foreign:
if p is None:
self.log.info("Registering foreign project: %s" % name)
p = Project(name, foreign=True)
self.layout.projects[name] = p

6
zuul/source/gerrit.py
View File

@ -243,11 +243,7 @@ class GerritSource(BaseSource):
if 'project' not in data:
raise exceptions.ChangeNotFound(change.number, change.patchset)
# If updated changed came as a dependent on
# and its project is not defined,
# then create a 'foreign' project for it in layout
change.project = self.sched.getProject(data['project'],
create_foreign=bool(history))
change.project = self.sched.getProject(data['project'])
change.branch = data['branch']
change.url = data['url']
max_ps = 0