diff options
| author |   Piotr Jaszczyk <piotr.jaszczyk@nokia.com> | 2019-04-04 14:08:33 +0200 |
|---|---|---|
| committer | Piotr Jaszczyk <piotr.jaszczyk@nokia.com> | 2019-04-04 14:10:06 +0200 |
| commit | 5e1e59df2fd0fd715911e4f674f8d64fe7269a50 (patch) | |
| tree | 9cb99fb41c0bcc85e01fade36181a38cec0b9a0a /plans/dcaegen2-collectors-hv-ves/testsuites/setup.sh | |
| parent | e23e0472ef7d0766bab1e5d3e7b856f50ccc9f17 (diff) | |
Replace docker-py in local buids, too
As tests are started locally in virtual env it's safe to invoke pip. We
want to remove obsolete docker-py package as it makes HV-VES testcases
fail.
Issue-ID: DCAEGEN2-1392
Change-Id: Ia364c970296e936094eae706bf60337a214f6205
Signed-off-by: Piotr Jaszczyk <piotr.jaszczyk@nokia.com>
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} |