Improve Local Running of CSIT Tests

[cps.git] / csit / plans / cps / setup.sh

diff --git a/csit/plans/cps/setup.sh b/csit/plans/cps/setup.sh
index 5b3fd96..d633b1e 100755 (executable)
--- 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