Make use of the EE resolver code when launching jobs

awx/main/tasks.py

@@ -881,14 +881,7 @@ def get_path_to(self, *args):
         return os.path.abspath(os.path.join(os.path.dirname(__file__), *args))
 
     def build_execution_environment_params(self, instance):
-        if getattr(instance, 'execution_environment', None):
-            # TODO: process heirarchy, JT-project-org, maybe here
-            # or maybe in create_unified_job
-            logger.info('using custom image {}'.format(instance.execution_environment.image))
-            image = instance.execution_environment.image
-        else:
-            logger.info('using default image')
-            image = settings.AWX_EXECUTION_ENVIRONMENT_DEFAULT_IMAGE
+        image = instance.execution_environment.image
         params = {
             "container_image": image,
             "process_isolation": True

awx/settings/defaults.py

@@ -58,12 +58,15 @@ def IS_TESTING(argv=None):
     }
 }
 
+# TODO: remove this setting in favor of a default execution environment
 AWX_EXECUTION_ENVIRONMENT_DEFAULT_IMAGE = 'quay.io/ansible/ansible-runner:devel'
 
 AWX_CONTAINER_GROUP_K8S_API_TIMEOUT = 10
 AWX_CONTAINER_GROUP_POD_LAUNCH_RETRIES = 100
 AWX_CONTAINER_GROUP_POD_LAUNCH_RETRY_DELAY = 5
 AWX_CONTAINER_GROUP_DEFAULT_NAMESPACE = 'default'
+
+# TODO: remove this setting in favor of a default execution environment
 AWX_CONTAINER_GROUP_DEFAULT_IMAGE = AWX_EXECUTION_ENVIRONMENT_DEFAULT_IMAGE
 
 # Internationalization