diff options
| author | Tobias Henkel <tobias.henkel@bmw.de> | 2019-03-19 08:26:02 +0100 |
|---|---|---|
| committer | Tobias Henkel <tobias.henkel@bmw.de> | 2019-03-19 10:09:36 +0100 |
| commit | fa0715eeac380992cf9cca6d4de1daf42e976189 (patch) | |
| tree | 1b76cd800a21cc44fa67e2fb4ab00d7a99044059 /tools | |
| parent | 0f8f24e7dfb55ef32fa3edf65a011b07928981ff (diff) | |
| download | zuul-fa0715eeac380992cf9cca6d4de1daf42e976189.tar.gz | |
Move ansible installation from pre_command to install phase in tox
We currently install ansible during the pre_command phase in tox. This
breaks the following use case:
tox -e py36 --notest
ttrun <test case>
This is broken now because ttrun doesn't run pre_commands. Instead we
already have a pip wrapper that does the nodeenv installation. We can
use this to also call zuul-manage-ansible on zuul installation.
Change-Id: I680777e5406368d35366602ac37e029db91c8a5c
Diffstat (limited to 'tools')
| -rwxr-xr-x | tools/pip.sh | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/tools/pip.sh b/tools/pip.sh index 0b94b1c79..a8474d77e 100755 --- a/tools/pip.sh +++ b/tools/pip.sh @@ -38,3 +38,8 @@ then popd fi pip install $* + +# Check if we're installing zuul. If so install the managed ansible as well. +if echo "$*" | grep -vq requirements.txt; then + zuul-manage-ansible -v +fi |