X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=csit%2Fplans%2Fcps%2Fsetup.sh;h=e7ad67e2b6023d37802de7a50dc76fec8f1211b9;hb=b2c8bc6b9bfd502be01e524c24628fcd10b1e177;hp=e4bdd47a9e52cac9ec1325157a1b6a9d8909795e;hpb=c9b89447ce2eab16206d6fee11fda59a35cb64cf;p=cps.git

diff --git a/csit/plans/cps/setup.sh b/csit/plans/cps/setup.sh
index e4bdd47a9..e7ad67e2b 100755
--- a/csit/plans/cps/setup.sh
+++ b/csit/plans/cps/setup.sh
@@ -1,6 +1,7 @@
 #!/bin/bash
 #
 # Copyright 2016-2017 Huawei Technologies Co., Ltd.
+# Modifications Copyright (C) 2022 Nordix Foundation.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -25,60 +26,45 @@
 
 check_health()
 {
-TIME_OUT=120
-INTERVAL=5
-TICKER=0
+  TIME_OUT=120
+  INTERVAL=5
+  TICKER=0
 
-while [ "$TICKER" -le "$TIME_OUT" ]; do
+  while [ "$TICKER" -le "$TIME_OUT" ]; do
 
-  RESPONSE=$(curl --location --request GET 'http://'$1'/manage/health/readiness')
+    RESPONSE=$(curl --location --request GET 'http://'$1'/manage/health/readiness')
 
-  if [[ "$RESPONSE" == *"UP"* ]]; then
-    echo "$2 started in $TICKER"
-    break;
-  fi
+    if [[ "$RESPONSE" == *"UP"* ]]; then
+      echo "$2 started in $TICKER"
+      break;
+    fi
 
-  sleep $INTERVAL
-  TICKER=$((TICKER + INTERVAL))
-
-done
+    sleep $INTERVAL
+    TICKER=$((TICKER + INTERVAL))
 
-if [ "$TICKER" -ge "$TIME_OUT" ]; then
-  echo TIME OUT: $2 session not started in $TIME_OUT seconds... Could cause problems for testing activities...
-fi
+  done
 
+  if [ "$TICKER" -ge "$TIME_OUT" ]; then
+    echo TIME OUT: $2 session not started in $TIME_OUT seconds... Could cause problems for testing activities...
+  fi
 }
 
 ###################### 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)
 
 ###################### setup cps-ncmp ############################
-mkdir -p $WORKSPACE/archives/dc-cps
-cp $WORKSPACE/../docker-compose/*.yml $WORKSPACE/archives/dc-cps
-cd $WORKSPACE/archives/dc-cps
+cd $CPS_HOME/docker-compose
 
-# 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
+curl -L https://github.com/docker/compose/releases/download/1.29.2/docker-compose-`uname -s`-`uname -m` > docker-compose
 chmod +x docker-compose
+docker-compose version
 
-# start CPS and PostgreSQL containers with docker compose
-./docker-compose up -d
-
-###################### setup onap-dmi-plugin ############################
-
-cd $WORKSPACE/archives
-git clone "https://gerrit.onap.org/r/cps/ncmp-dmi-plugin"
-mkdir -p $WORKSPACE/archives/dc-dmi
-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
-chmod +x docker-compose
-./docker-compose up -d
+# start CPS/NCMP, DMI Plugin, and PostgreSQL containers with docker compose
+docker-compose --profile dmi-service up -d
 
 ###################### setup sdnc #######################################
 source $WORKSPACE/plans/cps/sdnc/sdnc_setup.sh
@@ -143,4 +129,4 @@ check_health $DMI_HOST:$DMI_MANAGEMENT_PORT 'dmi-plugin'
 
 ###################### ROBOT Configurations ##########################
 # Pass variables required for Robot test suites in ROBOT_VARIABLES
-ROBOT_VARIABLES="-v CPS_CORE_HOST:$CPS_CORE_HOST -v CPS_CORE_PORT:$CPS_CORE_PORT -v DMI_HOST:$LOCAL_IP -v DMI_PORT:$DMI_PORT -v CPS_CORE_MANAGEMENT_PORT:$CPS_CORE_MANAGEMENT_PORT -v DATADIR:$WORKSPACE/data"
\ No newline at end of file
+ROBOT_VARIABLES="-v CPS_CORE_HOST:$CPS_CORE_HOST -v CPS_CORE_PORT:$CPS_CORE_PORT -v DMI_HOST:$LOCAL_IP -v DMI_PORT:$DMI_PORT -v CPS_CORE_MANAGEMENT_PORT:$CPS_CORE_MANAGEMENT_PORT -v DATADIR:$WORKSPACE/data --exitonfailure"