diff options
| author | Shane McDonald <me@shanemcd.com> | 2017-07-27 17:39:00 +0200 |
|---|---|---|
| committer | Shane McDonald <me@shanemcd.com> | 2017-07-27 17:39:00 +0200 |
| commit | c8b014292927523013ed2b3e77707f9e022fd6cb (patch) | |
| tree | e5cce75c18318e29df3be7a21db799ccc2bb0442 /tools/docker-compose | |
| parent | Merge pull request #81 from jangsutsr/6344_enforce_extra_vars_override_hierachy (diff) | |
| download | awx-c8b014292927523013ed2b3e77707f9e022fd6cb.tar.xz awx-c8b014292927523013ed2b3e77707f9e022fd6cb.zip | |
Fix test failures
Diffstat (limited to 'tools/docker-compose')
| -rw-r--r-- | tools/docker-compose/unit-tests/entrypoint.sh | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/tools/docker-compose/unit-tests/entrypoint.sh b/tools/docker-compose/unit-tests/entrypoint.sh index 63190314b9..1adfc079a4 100644 --- a/tools/docker-compose/unit-tests/entrypoint.sh +++ b/tools/docker-compose/unit-tests/entrypoint.sh @@ -1,9 +1,9 @@ #!/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 -R /tmp/awx.egg-info /awx_devel/ || true +sed -i "s/placeholder/$(git describe --long | sed 's/\./\\./g')/" /awx_devel/awx.egg-info/PKG-INFO +cp /tmp/awx.egg-link /venv/awx/lib/python2.7/site-packages/awx.egg-link cp -f awx/settings/local_settings.py.docker_compose awx/settings/local_settings.py |