From cfa8b96c1b28a7dc4f846bb74dc68d036ec431cb Mon Sep 17 00:00:00 2001
From: MD IRSHAD SHEIKH <md.irshad.sheikh@huawei.com>
Date: Thu, 1 Apr 2021 23:05:39 +0530
Subject: Update docker-compose for Macroflow with HEAT and small refactoring

Issue-ID: SO-3533

Signed-off-by: MD IRSHAD SHEIKH <md.irshad.sheikh@huawei.com>
Change-Id: Ic1d0f2b836ac4988fb1d8816542bce35aace3a37
---
 plans/so/macroflow/teardown.sh | 38 +++++++++++++++++++++++++++++---------
 1 file changed, 29 insertions(+), 9 deletions(-)

(limited to 'plans/so/macroflow/teardown.sh')

diff --git a/plans/so/macroflow/teardown.sh b/plans/so/macroflow/teardown.sh
index 82966887..248ecff4 100644
--- a/plans/so/macroflow/teardown.sh
+++ b/plans/so/macroflow/teardown.sh
@@ -1,23 +1,43 @@
 #!/bin/bash
+#
+# ============LICENSE_START=======================================================
+# Copyright 2021 Huawei Technologies Co., Ltd.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+#  SPDX-License-Identifier: Apache-2.0
+# ============LICENSE_END=========================================================
 
-# SCRIPT_HOME="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
-SCRIPT_HOME=$WORKSPACE/plans/so/integration-etsi-testing
+INTEGRATION_ETSI_TESTING_DIR=$WORKSPACE/plans/so/integration-etsi-testing
+INTEGRATION_ETSI_TESTING_CONFIG_DIR=$INTEGRATION_ETSI_TESTING_DIR/config
+
+# Macroflow Path
+SCRIPT_HOME="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 SCRIPT_NAME=$(basename $0)
-CONFIG_DIR=$SCRIPT_HOME/config
-ENV_FILE=$CONFIG_DIR/env
-TEMP_DIR_PATH=$SCRIPT_HOME/temp
-TEST_LAB_DIR_PATH=$TEMP_DIR_PATH/test_lab
+CONFIG_DIR_MACRO=$SCRIPT_HOME/config
+ENV_FILE=$CONFIG_DIR_MACRO/env
 DOCKER_COMPOSE_FILE_PATH=$SCRIPT_HOME/docker-compose.yml
 DOCKER_COMPOSE_LOCAL_OVERRIDE_FILE=$SCRIPT_HOME/docker-compose.local.yml
 
+TEMP_DIR_PATH=$MACRO_HOME/temp
+TEST_LAB_DIR_PATH=$TEMP_DIR_PATH/test_lab
 
 echo "Running $SCRIPT_HOME/$SCRIPT_NAME ..."
 export $(egrep -v '^#' $ENV_FILE | xargs)
 export TEST_LAB_DIR=$TEST_LAB_DIR_PATH
-export CONFIG_DIR_PATH=$CONFIG_DIR
+export CONFIG_DIR_PATH=$INTEGRATION_ETSI_TESTING_CONFIG_DIR
+export CONFIG_DIR_PATH_MACRO=$CONFIG_DIR_MACRO
 
-echo "Sleeping 2m for completing the macroflow task"
-sleep 2m
 
 if [ "$DOCKER_ENVIRONMENT" == "remote" ]; then
   echo "Tearing down docker containers from remote images ..."
-- 
cgit 1.2.3-korg