From f2dfa132a77814a72340024655e4e830c0732ce2 Mon Sep 17 00:00:00 2001
From: Shane McDonald <me@shanemcd.com>
Date: Mon, 8 Feb 2021 15:50:06 -0500
Subject: [PATCH] Install Ansible only for collection tests

---
 Makefile                                               | 3 ++-
 tools/ansible/roles/dockerfile/templates/Dockerfile.j2 | 2 ++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index b3d14d4ba9..858a6f67e4 100644
--- a/Makefile
+++ b/Makefile
@@ -383,7 +383,8 @@ test_collection:
 	rm -f $(shell ls -d $(VENV_BASE)/awx/lib/python* | head -n 1)/no-global-site-packages.txt
 	if [ "$(VENV_BASE)" ]; then \
 		. $(VENV_BASE)/awx/bin/activate; \
-	fi; \
+	fi && \
+	pip install ansible && \
 	py.test $(COLLECTION_TEST_DIRS) -v
 	# The python path needs to be modified so that the tests can find Ansible within the container
 	# First we will use anything expility set as PYTHONPATH
diff --git a/tools/ansible/roles/dockerfile/templates/Dockerfile.j2 b/tools/ansible/roles/dockerfile/templates/Dockerfile.j2
index 78eebc2977..15c25c2d3a 100644
--- a/tools/ansible/roles/dockerfile/templates/Dockerfile.j2
+++ b/tools/ansible/roles/dockerfile/templates/Dockerfile.j2
@@ -225,7 +225,9 @@ RUN for dir in \
 {% if (build_dev|bool) or (kube_dev|bool) %}
 RUN for dir in \
       /var/lib/awx/venv \
+      /var/lib/awx/venv/awx/bin \
       /var/lib/awx/venv/awx/lib/python3.6 \
+      /var/lib/awx/venv/awx/lib/python3.6/site-packages \
       /var/lib/awx/projects \
       /var/lib/awx/rsyslog \
       /var/run/awx-rsyslog \