From 5e1e59df2fd0fd715911e4f674f8d64fe7269a50 Mon Sep 17 00:00:00 2001 From: Piotr Jaszczyk Date: Thu, 4 Apr 2019 14:08:33 +0200 Subject: 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 --- plans/dcaegen2-collectors-hv-ves/testsuites/env_local.sh | 2 -- plans/dcaegen2-collectors-hv-ves/testsuites/setup.sh | 11 ++++++----- 2 files changed, 6 insertions(+), 7 deletions(-) (limited to 'plans') diff --git a/plans/dcaegen2-collectors-hv-ves/testsuites/env_local.sh b/plans/dcaegen2-collectors-hv-ves/testsuites/env_local.sh index e1bf2a8b..280f0c47 100755 --- a/plans/dcaegen2-collectors-hv-ves/testsuites/env_local.sh +++ b/plans/dcaegen2-collectors-hv-ves/testsuites/env_local.sh @@ -39,5 +39,3 @@ export HV_VES_IMAGE="hv-collector-main" export DCAE_APP_SIMULATOR_IMAGE="hv-collector-dcae-app-simulator" export XNF_SIMULATOR_IMAGE="hv-ves-collector-xnf-simulator" - - 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} -- cgit 1.2.3-korg