diff options
| author | Matt Clay <matt@mystile.com> | 2016-08-31 15:16:15 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-08-31 15:16:15 -0700 |
| commit | 6e65ebda264c8654cdc6d7ac96dab95430e1f7e8 (patch) | |
| tree | 1d46e4a42526887ee655202ec4c88c668f54affe | |
| parent | 93443bad2f24d96ec28b2a052714af30c797810c (diff) | |
| download | ansible-6e65ebda264c8654cdc6d7ac96dab95430e1f7e8.tar.gz | |
Put integration.sh pip reqs in separate file. (#17338)
| -rw-r--r-- | test/utils/shippable/integration-requirements.txt | 1 | ||||
| -rwxr-xr-x | test/utils/shippable/integration.sh | 5 |
2 files changed, 4 insertions, 2 deletions
diff --git a/test/utils/shippable/integration-requirements.txt b/test/utils/shippable/integration-requirements.txt new file mode 100644 index 0000000000..45c1e038e5 --- /dev/null +++ b/test/utils/shippable/integration-requirements.txt @@ -0,0 +1 @@ +jmespath diff --git a/test/utils/shippable/integration.sh b/test/utils/shippable/integration.sh index bd6d20effd..f9b04ae5c7 100755 --- a/test/utils/shippable/integration.sh +++ b/test/utils/shippable/integration.sh @@ -94,12 +94,13 @@ if [ "${test_python3}" ]; then test_flags="--skip-tags ${skip_tags} ${test_flags}" fi -docker exec "${container_id}" pip install jmespath - if [ "${copy_source}" ]; then docker exec "${container_id}" cp -a "${test_shared_dir}" "${test_ansible_dir}" fi +docker exec "${container_id}" \ + pip install -r "${test_ansible_dir}/test/utils/shippable/integration-requirements.txt" --upgrade + if [ "${test_python3}" ]; then docker exec "${container_id}" sed -i -f \ "${test_ansible_dir}/test/utils/shippable/python3-test-target-blacklist.txt" \ |