External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-03-05 10:41:05 -03:30
Code Issues Packages Projects Releases Wiki Activity

Install Ansible only for collection tests

Browse Source
This commit is contained in:
Shane McDonald
2021-02-08 15:50:06 -05:00
parent ddcbc408b9
commit f2dfa132a7
2 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Makefile
View File

@@ -383,7 +383,8 @@ test_collection:
rm -f $(shell ls -d $(VENV_BASE)/awx/lib/python* | head -n 1)/no-global-site-packages.txt rm -f $(shell ls -d $(VENV_BASE)/awx/lib/python* | head -n 1)/no-global-site-packages.txt
if [ "$(VENV_BASE)" ]; then \ if [ "$(VENV_BASE)" ]; then \
. $(VENV_BASE)/awx/bin/activate; \ . $(VENV_BASE)/awx/bin/activate; \
fi; \ fi && \
pip install ansible && \
py.test $(COLLECTION_TEST_DIRS) -v py.test $(COLLECTION_TEST_DIRS) -v
# The python path needs to be modified so that the tests can find Ansible within the container # 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 # First we will use anything expility set as PYTHONPATH

2
tools/ansible/roles/dockerfile/templates/Dockerfile.j2
View File

@@ -225,7 +225,9 @@ RUN for dir in \
{% if (build_dev|bool) or (kube_dev|bool) %} {% if (build_dev|bool) or (kube_dev|bool) %}
RUN for dir in \ RUN for dir in \
/var/lib/awx/venv \ /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 \
/var/lib/awx/venv/awx/lib/python3.6/site-packages \
/var/lib/awx/projects \ /var/lib/awx/projects \
/var/lib/awx/rsyslog \ /var/lib/awx/rsyslog \
/var/run/awx-rsyslog \ /var/run/awx-rsyslog \