Merge "Differentiate between queued and waiting jobs in zuul web UI"

web/src/containers/status/ChangePanel.jsx

@@ -222,7 +222,7 @@ class ChangePanel extends React.Component {
       case 'skipped':
         className = 'label-info'
         break
-      // 'in progress' 'queued' 'lost' 'aborted' ...
+      // 'in progress' 'queued' 'lost' 'aborted' 'waiting' ...
       default:
         className = 'label-default'
     }
@@ -258,7 +258,11 @@ class ChangePanel extends React.Component {
     let result = job.result ? job.result.toLowerCase() : null
     if (result === null) {
       if (job.url === null) {
-        result = 'queued'
+        if (job.queued === false) {
+          result = 'waiting'
+        } else {
+          result = 'queued'
+        }
       } else if (job.paused !== null && job.paused) {
         result = 'paused'
       } else {

zuul/model.py

@@ -1197,6 +1197,7 @@ class Job(ConfigObject):
             _files=(),
             _irrelevant_files=(),
             secrets=(),  # secrets aren't inheritable
+            queued=False,
         )
 
         self.inheritable_attributes = {}
@@ -2527,6 +2528,7 @@ class QueueItem(object):
                     # If this job needs a semaphore, either acquire it or
                     # make sure that we have it before requesting the nodes.
                     toreq.append(job)
+                    job.queued = True
         return toreq
 
     def setResult(self, build):
@@ -2768,6 +2770,7 @@ class QueueItem(object):
                 'paused': build.paused if build else None,
                 'retry': build.retry if build else None,
                 'tries': self.current_build_set.getTries(job.name),
+                'queued': job.queued,
                 'node_labels': build.node_labels if build else [],
                 'node_name': build.node_name if build else None,
                 'worker': worker,