Merge pull request #4655 from AlanCoding/null_ujt

Handle case of node with null UJT

awx/main/scheduler/__init__.py

@@ -114,6 +114,8 @@ class TaskManager():
             dag = WorkflowDAG(workflow_job)
             spawn_nodes = dag.bfs_nodes_to_run()
             for spawn_node in spawn_nodes:
+                if spawn_node.unified_job_template is None:
+                    continue
                 kv = spawn_node.get_job_kwargs()
                 job = spawn_node.unified_job_template.create_unified_job(**kv)
                 spawn_node.job = job

awx/main/scheduler/dag_workflow.py

@@ -67,6 +67,8 @@ class WorkflowDAG(SimpleDAG):
             obj = n['node_object']
             job = obj.job
 
+            if obj.unified_job_template is None:
+                continue
             if not job:
                 return False
             # Job is about to run or is running. Hold our horses and wait for

awx/main/tests/unit/scheduler/test_dag.py

@@ -5,7 +5,7 @@ import pytest
 # AWX
 from awx.main.scheduler.dag_simple import SimpleDAG
 from awx.main.scheduler.dag_workflow import WorkflowDAG
-from awx.main.models import Job
+from awx.main.models import Job, JobTemplate
 from awx.main.models.workflow import WorkflowJobNode
 
 
@@ -72,6 +72,7 @@ def factory_node():
         if status:
             j = Job(status=status)
             wfn.job = j
+        wfn.unified_job_template = JobTemplate(name='JT{}'.format(id))
         return wfn
     return fn