Stop overwriting demo.sh test output logs

[oom.git] / kubernetes / robot / demo-k8s.sh

diff --git a/kubernetes/robot/demo-k8s.sh b/kubernetes/robot/demo-k8s.sh
index f5e4398..971c0c4 100755 (executable)
--- a/kubernetes/robot/demo-k8s.sh
+++ b/kubernetes/robot/demo-k8s.sh
@@ -1,4 +1,18 @@
-#!/bin/bash -x
+# Copyright © 2018 Amdocs, Bell Canada
+#
+# 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.
+
+#!/bin/bash
 
 #
 # Execute tags built to support the hands on demo,
@@ -31,7 +45,7 @@ function usage
        echo "       demo.sh <namespace> deleteVNF <module_name from instantiateVFW>"
     echo "               - Delete the module created by instantiateVFW"
        echo " "
-       echo "       demo.sh <namespace> heatbridge <stack_name> <service_instance_id> <service>"
+       echo "       demo.sh <namespace> heatbridge <stack_name> <service_instance_id> <service> <oam-ip-address>"
     echo "               - Run heatbridge against the stack for the given service instance and service"
 }
 
@@ -135,8 +149,8 @@ do
        heatbridge)
                        TAG="heatbridge"
                        shift
-                       if [ $# -ne 3 ];then
-                               echo "Usage: demo.sh <namespace> heatbridge <stack_name> <service_instance_id> <service>"
+                       if [ $# -ne 4 ];then
+                               echo "Usage: demo.sh <namespace> heatbridge <stack_name> <service_instance_id> <service> <oam-ip-address>"
                                exit
                        fi
                        VARIABLES="$VARIABLES -v HB_STACK:$1"
@@ -145,6 +159,12 @@ do
                        shift
                        VARIABLES="$VARIABLES -v HB_SERVICE:$1"
                        shift
+                       VARIABLES="$VARIABLES -v HB_IPV4_OAM_ADDRESS:$1"
+                       shift
+                       ;;
+       cds)
+                       TAG="cds"
+                       shift
                        ;;
        *)
                        usage
@@ -152,7 +172,17 @@ do
        esac
 done
 
+set -x
+
+POD=$(kubectl --namespace $NAMESPACE get pods | sed 's/ .*//'| grep robot)
+
 ETEHOME=/var/opt/OpenECOMP_ETE
+
+export GLOBAL_BUILD_NUMBER=$(kubectl --namespace $NAMESPACE exec  ${POD}  -- bash -c "ls -1q /share/logs/ | wc -l")
+OUTPUT_FOLDER=$(printf %04d $GLOBAL_BUILD_NUMBER)_demo_$key
+DISPLAY_NUM=$(($GLOBAL_BUILD_NUMBER + 90))
+
 VARIABLEFILES="-V /share/config/vm_properties.py -V /share/config/integration_robot_properties.py -V /share/config/integration_preload_parameters.py"
-POD=$(kubectl --namespace $NAMESPACE get pods | sed 's/ .*//'| grep robot)
-kubectl --namespace $NAMESPACE exec ${POD} -- ${ETEHOME}/runTags.sh ${VARIABLEFILES} ${VARIABLES} -d /share/logs/demo/${TAG} -i ${TAG} --display 89 2> ${TAG}.out
+
+kubectl --namespace $NAMESPACE exec ${POD} -- ${ETEHOME}/runTags.sh ${VARIABLEFILES} ${VARIABLES} -d /share/logs/${OUTPUT_FOLDER} -i ${TAG} --display $DISPLAY_NUM 2> ${TAG}.out
+