zuul
/
zuul
Code Issues Proposed changes

Don't show jobs for non-live changes 

Currently the job listing for changes in the status JSON as well
as the jobs that are checked for completion, and listed in the report
all come from a method that operates on changes, not items.
Alter it to operate on items so it can return the empty list for
non-live items.  This is safe within the queue processor because of
the previous change that explicitly checks for non-live items when
determining whether changes are complete.

Include the liveness attribute in the status JSON.

Use a grey dot for non-live items in the status screen.

Change-Id: I8907108a2f8f43c75b9cabe86e7c519790d58027
This commit is contained in:
James E. Blair 2015-02-07 08:23:10 -08:00
parent ec2e156495
commit 107c385ec2
3 changed files with 19 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
etc/status/public_html/jquery.zuul.js
View File

@ -370,6 +370,11 @@
icon_title = 'Waiting until closer to head of queue to' +
' start jobs';
}
else if (change.live !== true) {
// Grey icon
icon_name = 'grey.png';
icon_title = 'Dependent change independently tested';
}
else if (change.failing_reasons &&
change.failing_reasons.length > 0) {
var reason = change.failing_reasons.join(', ');

23
zuul/model.py
View File

@ -118,11 +118,13 @@ class Pipeline(object):
tree = self.job_trees.get(project)
return tree
def getJobs(self, changeish):
tree = self.getJobTree(changeish.project)
def getJobs(self, item):
if not item.live:
return []
tree = self.getJobTree(item.change.project)
if not tree:
return []
return changeish.filterJobs(tree.getJobs())
return item.change.filterJobs(tree.getJobs())
def _findJobsToRun(self, job_trees, item):
torun = []
@ -159,21 +161,21 @@ class Pipeline(object):
return self._findJobsToRun(tree.job_trees, item)
def haveAllJobsStarted(self, item):
for job in self.getJobs(item.change):
for job in self.getJobs(item):
build = item.current_build_set.getBuild(job.name)
if not build or not build.start_time:
return False
return True
def areAllJobsComplete(self, item):
for job in self.getJobs(item.change):
for job in self.getJobs(item):
build = item.current_build_set.getBuild(job.name)
if not build or not build.result:
return False
return True
def didAllJobsSucceed(self, item):
for job in self.getJobs(item.change):
for job in self.getJobs(item):
if not job.voting:
continue
build = item.current_build_set.getBuild(job.name)
@ -189,7 +191,7 @@ class Pipeline(object):
return True
def didAnyJobFail(self, item):
for job in self.getJobs(item.change):
for job in self.getJobs(item):
if not job.voting:
continue
build = item.current_build_set.getBuild(job.name)
@ -200,7 +202,7 @@ class Pipeline(object):
def isHoldingFollowingChanges(self, item):
if not item.live:
return False
for job in self.getJobs(item.change):
for job in self.getJobs(item):
if not job.hold_following_changes:
continue
build = item.current_build_set.getBuild(job.name)
@ -700,6 +702,7 @@ class QueueItem(object):
changeish = self.change
ret = {}
ret['active'] = self.active
ret['live'] = self.live
if hasattr(changeish, 'url') and changeish.url is not None:
ret['url'] = changeish.url
else:
@ -720,7 +723,7 @@ class QueueItem(object):
else:
ret['owner'] = None
max_remaining = 0
for job in self.pipeline.getJobs(changeish):
for job in self.pipeline.getJobs(self):
now = time.time()
build = self.current_build_set.getBuild(job.name)
elapsed = None
@ -796,7 +799,7 @@ class QueueItem(object):
changeish.project.name,
changeish._id(),
self.item_ahead)
for job in self.pipeline.getJobs(changeish):
for job in self.pipeline.getJobs(self):
build = self.current_build_set.getBuild(job.name)
if build:
result = build.result

2
zuul/scheduler.py
View File

@ -1521,7 +1521,7 @@ class BasePipelineManager(object):
else:
url_pattern = None
for job in self.pipeline.getJobs(item.change):
for job in self.pipeline.getJobs(item):
build = item.current_build_set.getBuild(job.name)
result = build.result
pattern = url_pattern