Fix unit test runs

This commit is contained in:
Shane McDonald
2017-07-25 14:01:43 -04:00
parent 1249a8b30f
commit e904d47122
3 changed files with 15 additions and 3 deletions

View File

@@ -7,5 +7,7 @@ RUN npm set progress=false
WORKDIR "/awx_devel"
ENTRYPOINT ["/bin/bash", "-c"]
CMD ["bash"]
ADD tools/docker-compose/unit-tests/entrypoint.sh /
RUN chmod +x /entrypoint.sh
ENTRYPOINT ["/entrypoint.sh"]

View File

@@ -9,6 +9,6 @@ services:
environment:
SWIG_FEATURES: "-cpperraswarn -includeall -I/usr/include/openssl"
TEST_DIRS: awx/main/tests/functional awx/main/tests/unit awx/conf/tests awx/sso/tests
command: ["cp /tmp/ansible-awx.egg-link /venv/awx/lib/python2.7/site-packages/ansible-awx.egg-link; make test"]
command: ["make test"]
volumes:
- ../../../:/awx_devel

View File

@@ -0,0 +1,10 @@
#!/bin/bash
# Code duplicated from start_development.sh
cp -R /tmp/ansible_awx.egg-info /awx_devel/ || true
sed -i "s/placeholder/$(git describe --long | sed 's/\./\\./g')/" /awx_devel/ansible_awx.egg-info/PKG-INFO
cp /tmp/ansible-awx.egg-link /venv/awx/lib/python2.7/site-packages/ansible-awx.egg-link
cp -f awx/settings/local_settings.py.docker_compose awx/settings/local_settings.py
/bin/bash -c "$@"