summaryrefslogtreecommitdiffstats
path: root/test/csit/plans/dcaegen2
diff options
context:
space:
mode:
authorMariusz Wagner <mariusz.wagner@nokia.com>2018-07-31 09:32:05 +0200
committerMariusz Wagner <mariusz.wagner@nokia.com>2018-07-31 13:58:59 +0200
commit7a1e0c8a922f60b9443179ca874d5966afdc54a7 (patch)
tree0d25bb57bb9837a6df8a305cccf69c6b888710d5 /test/csit/plans/dcaegen2
parent3cbe54761c77812594cf6c497482373e814792c1 (diff)
Cleaning tests
- Removed problem with version docker package - Change from python2 to python3 Issue-ID: INT-604 Change-Id: I4c5669926198569871634a7fed541b21aaa91eb9 Signed-off-by: Mariusz Wagner <mariusz.wagner@nokia.com>
Diffstat (limited to 'test/csit/plans/dcaegen2')
-rw-r--r--test/csit/plans/dcaegen2/prh-testsuites/setup.sh7
1 files changed, 4 insertions, 3 deletions
diff --git a/test/csit/plans/dcaegen2/prh-testsuites/setup.sh b/test/csit/plans/dcaegen2/prh-testsuites/setup.sh
index 058ed20bd..a5ce48b52 100644
--- a/test/csit/plans/dcaegen2/prh-testsuites/setup.sh
+++ b/test/csit/plans/dcaegen2/prh-testsuites/setup.sh
@@ -9,6 +9,9 @@ export AAI_SIMULATOR="aai_simulator"
cd ${WORKSPACE}/test/csit/tests/dcaegen2/prh-testcases/resources/
docker login -u docker -p docker nexus3.onap.org:10001
+pip uninstall -y docker-py
+pip uninstall -y docker
+pip install -U docker
docker-compose up -d --build
# Wait for initialization of Docker containers
@@ -37,7 +40,7 @@ echo PRH_IP=${PRH_IP}
echo DMAAP_SIMULATOR_IP=${DMAAP_SIMULATOR_IP}
echo AAI_SIMULATOR_IP=${AAI_SIMULATOR_IP}
-# Wait for initialization of docker services
+# Wait for initialization of PRH services
for i in {1..10}; do
curl -sS -m 1 localhost:8100/heartbeat && break
echo sleep ${i}
@@ -53,5 +56,3 @@ docker start prh
# #Pass any variables required by Robot test suites in ROBOT_VARIABLES
ROBOT_VARIABLES="-v DMAAP_SIMULATOR:${DMAAP_SIMULATOR_IP}:2222 -v AAI_SIMULATOR:${AAI_SIMULATOR_IP}:3333 -v PRH:${PRH_IP}:8100"
-
-pip install docker==2.7.0