From fde7a1e3e5680af91c3373e51659a765d73115e1 Mon Sep 17 00:00:00 2001
From: Jeff Bradberry <jeff.bradberry@gmail.com>
Date: Thu, 10 Dec 2020 09:27:45 -0500
Subject: [PATCH] Ensure that the updated job instance is used

when attaching an EE.
---
 awx/main/tasks.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/awx/main/tasks.py b/awx/main/tasks.py
index 8f09f67f56..d0a78064af 100644
--- a/awx/main/tasks.py
+++ b/awx/main/tasks.py
@@ -888,7 +888,8 @@ class BaseTask(object):
 
     def build_execution_environment_params(self, instance):
         if instance.execution_environment_id is None:
-            self.update_model(instance.pk, execution_environment=instance.resolve_execution_environment())
+            self.instance = instance = self.update_model(
+                instance.pk, execution_environment=instance.resolve_execution_environment())
 
         image = instance.execution_environment.image
         params = {