X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=csit%2Fplans%2Fcps%2Fsetup.sh;h=d633b1ee264959c0e8b11ae41000d7efe190c4e3;hb=59d2520ccc8911ee6eaffa03f4113458f5684895;hp=5b3fd9649783e2ea0ccf2cd717ef55f91e6e64bd;hpb=70f9a7d4f2d46f2630f8045d1729ecc3d3131f56;p=cps.git diff --git a/csit/plans/cps/setup.sh b/csit/plans/cps/setup.sh index 5b3fd9649..d633b1ee2 100755 --- a/csit/plans/cps/setup.sh +++ b/csit/plans/cps/setup.sh @@ -50,7 +50,7 @@ check_health() ###################### setup env ############################ # Set env variables for docker compose -export LOCAL_IP=$(ip -4 addr show docker0 | grep -Po 'inet \K[\d.]+') +export LOCAL_IP=$((ip -4 addr show docker0 | grep -Po 'inet \K[\d.]+') || hostname -I | awk '{print $1}') source $WORKSPACE/plans/cps/test.properties export $(cut -d= -f1 $WORKSPACE/plans/cps/test.properties) @@ -75,8 +75,8 @@ mkdir -p $WORKSPACE/archives/dc-dmi cat $WORKSPACE/archives/ncmp-dmi-plugin/docker-compose/docker-compose.yml cp $WORKSPACE/archives/ncmp-dmi-plugin/docker-compose/*.yml $WORKSPACE/archives/dc-dmi cd $WORKSPACE/archives/dc-dmi -# download docker-compose of a required version (1.25.0 supports configuration of version 3.7) -curl -L https://github.com/docker/compose/releases/download/1.25.0/docker-compose-`uname -s`-`uname -m` > docker-compose +# copy docker-compose (downloaded already for cps) +cp $WORKSPACE/archives/dc-cps/docker-compose . chmod +x docker-compose ./docker-compose up -d