diff options
author | 2019-04-04 18:49:44 +0000 | |
---|---|---|
committer | 2019-04-04 18:49:44 +0000 | |
commit | 931233eaa32f1c31804d3ebde36da4bafd2fbc71 (patch) | |
tree | 4b8bef970e8fae4c148b9cdad131a917488df385 /plans/dcaegen2-collectors-hv-ves/testsuites/setup.sh | |
parent | ae029365a2dd3a0893310b4d24eb34095280957e (diff) | |
parent | 5e1e59df2fd0fd715911e4f674f8d64fe7269a50 (diff) |
Merge "Replace docker-py in local buids, too"
Diffstat (limited to 'plans/dcaegen2-collectors-hv-ves/testsuites/setup.sh')
-rwxr-xr-x | plans/dcaegen2-collectors-hv-ves/testsuites/setup.sh | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/plans/dcaegen2-collectors-hv-ves/testsuites/setup.sh b/plans/dcaegen2-collectors-hv-ves/testsuites/setup.sh index 06eaf543..73fdbc23 100755 --- a/plans/dcaegen2-collectors-hv-ves/testsuites/setup.sh +++ b/plans/dcaegen2-collectors-hv-ves/testsuites/setup.sh @@ -21,14 +21,15 @@ set -euo pipefail RUN_CSIT_LOCAL=${RUN_CSIT_LOCAL:-false} +echo "Replacing obsolete 'docker-py' with 'docker' package" +pip uninstall -y docker-py +pip install docker + if ${RUN_CSIT_LOCAL} ; then - echo "Building locally - assuming all dependencies are installed" + echo "Local run" source env_local.sh else - echo "Default run - install all dependencies" - pip uninstall -y docker-py - pip install docker - + echo "Default (CI) run" COMPOSE_VERSION=1.23.2 COMPOSE_LOCATION='/usr/local/bin/docker-compose' sudo curl -L https://github.com/docker/compose/releases/download/${COMPOSE_VERSION}/docker-compose-$(uname -s)-$(uname -m) -o ${COMPOSE_LOCATION} |