From 6e65ebda264c8654cdc6d7ac96dab95430e1f7e8 Mon Sep 17 00:00:00 2001 From: Matt Clay Date: Wed, 31 Aug 2016 15:16:15 -0700 Subject: [PATCH] Put integration.sh pip reqs in separate file. (#17338) --- test/utils/shippable/integration-requirements.txt | 1 + test/utils/shippable/integration.sh | 5 +++-- 2 files changed, 4 insertions(+), 2 deletions(-) create mode 100644 test/utils/shippable/integration-requirements.txt diff --git a/test/utils/shippable/integration-requirements.txt b/test/utils/shippable/integration-requirements.txt new file mode 100644 index 00000000000..45c1e038e5f --- /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 bd6d20effd9..f9b04ae5c76 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" \