diff options
| author |   Mariusz Wagner <mariusz.wagner@nokia.com> | 2018-07-05 11:32:51 +0200 |
|---|---|---|
| committer | Mariusz Wagner <mariusz.wagner@nokia.com> | 2018-07-05 11:32:51 +0200 |
| commit | 60be36dd12980b15db0edbb7d14c7a719596d367 (patch) | |
| tree | d46b95ea0986ec9da890a02e8bae89ec8051a172 /test/csit/plans/dcaegen2 | |
| parent | bc76450dfae26da5364b4ef79535314598e04a1c (diff) | |
Fix for jenkins job
Issue-ID: INT-510
Change-Id: I75cd49524b313d1db121b246b70f8b3ba2ba11d4
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.sh | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/test/csit/plans/dcaegen2/prh-testsuites/setup.sh b/test/csit/plans/dcaegen2/prh-testsuites/setup.sh index cdac9d210..e4b1cd7c1 100644 --- a/test/csit/plans/dcaegen2/prh-testsuites/setup.sh +++ b/test/csit/plans/dcaegen2/prh-testsuites/setup.sh @@ -12,7 +12,7 @@ docker login -u docker -p docker nexus3.onap.org:10003 docker-compose up -d --build # Wait for initialization of Docker containers -for i in {1..50}; do +for i in {1..10}; do if [ $(docker inspect --format '{{ .State.Running }}' ${PRH_SERVICE}) ] && \ [ $(docker inspect --format '{{ .State.Running }}' ${DMAAP_SIMULATOR}) ] && \ [ $(docker inspect --format '{{ .State.Running }}' ${AAI_SIMULATOR}) ] @@ -38,7 +38,7 @@ echo DMAAP_SIMULATOR_IP=${DMAAP_SIMULATOR_IP} echo AAI_SIMULATOR_IP=${AAI_SIMULATOR_IP} # Wait for initialization of docker services -for i in {1..50}; do +for i in {1..10}; do curl -sS -m 1 localhost:2222 && \ curl -sS -m 1 localhost:3333 && \ curl -sS -m 1 localhost:8100/heartbeat && break @@ -46,12 +46,14 @@ for i in {1..50}; do sleep ${i} done +docker stop prh docker cp prh:/config/prh_endpoints.json ${WORKDIR} sed -i -e 's/"dmaapHostName":.*/"dmaapHostName": "'${DMAAP_SIMULATOR_IP}'",/g' ${WORKDIR}/prh_endpoints.json sed -i -e 's/"aaiHost":.*/"aaiHost": "'${AAI_SIMULATOR_IP}'",/g' ${WORKDIR}/prh_endpoints.json docker cp ${WORKDIR}/prh_endpoints.json prh:/config/ +docker start prh -#Pass any variables required by Robot test suites in ROBOT_VARIABLES -ROBOT_VARIABLES="-v DMAAP_SIMULATOR:localhost:2222 -v AAI_SIMULATOR:localhost:3333 -v PRH:localhost:8100" +# #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 +pip install docker==2.7.0 |