X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=kubernetes%2Frobot%2Fete-k8s.sh;h=a59e3b6a33bc8e6207418c7c368d4af8f074c6e1;hb=46d00ca058db91a2c1110afe759ca4b10061daae;hp=2305a584c3a4a9f1baa7a8bea051a46d7aeb8d46;hpb=4ad5bad29a9c75863424e1090fb82342a7eaaab0;p=oom.git

diff --git a/kubernetes/robot/ete-k8s.sh b/kubernetes/robot/ete-k8s.sh
index 2305a584c3..a59e3b6a33 100755
--- a/kubernetes/robot/ete-k8s.sh
+++ b/kubernetes/robot/ete-k8s.sh
@@ -1,3 +1,17 @@
+# 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
 
 #
@@ -5,19 +19,59 @@
 # Please clean up logs when you are done...
 # Note: Do not run multiple concurrent ete.sh as the --display is not parameterized and tests will collide
 #
-if [ "$1" == "" ];then
-   echo "Usage: ete.sh [ health | ete | closedloop | instantiate | distribute ]"
+if [ "$1" == "" ] || [ "$2" == "" ]; then
+   echo "Usage: ete-k8s.sh [namespace] [ health | healthdist | distribute | instantiate | instantiateVFWCL | instantiateDemoVFWCL |  | portal ]"
+   echo ""
+   echo "  List of test case tags (filename for intent: tag) "
+   echo " "
+   echo "  cds.robot: cds "
+   echo " "
+   echo "  clamp.robot: clamp "
+   echo " "
+   echo "  demo.robot: InitDemo, InitCustomer , APPCCDTPreloadDemo, APPCMountPointDemo, DistributeDemoVFWDT, DistributeVFWNG,  "
+   echo "              InitDistribution, PreloadDemo, deleteVNF, heatbridge, instantiateDemoVFWCL, instantiateVFW, instantiateVFWCL, instantiateVFWDT "
+   echo " "
+   echo "  health-check.robot: health , core, small, medium, 3rdparty, api,  datarouter, externalapi, health-aaf, health-aai, health-appc, "
+   echo "                      health-clamp, health-cli, health-dcae, health-dmaap, health-log, health-modeling, health-msb, "
+   echo "                      health-multicloud, health-oof, health-policy, health-pomba, health-portal, health-sdc, health-sdnc, "
+   echo "                      health-so, health-uui, health-vfc, health-vid, health-vnfsdk, healthdist, healthlogin, healthmr, "
+   echo "                      healthportalapp, multicloud, oom "
+   echo " "
+   echo " hvves.robot: :HVVES, ete "
+   echo " "
+   echo " model-distribution-vcpe.robot: distributevCPEResCust "
+   echo " "
+   echo " model-distribution.robot: distribute, distributeVFWDT, distributeVLB "
+   echo " "
+   echo " oof-*.robot: cmso , has, homing "
+   echo " "
+   echo " pnf-registration.robot: ete, pnf_registrate "
+   echo " "
+   echo " post-install-tests.robot dmaapacl, postinstall"
+   echo " "
+   echo " update_onap_page.robot: UpdateWebPage "
+   echo " "
+   echo " vnf-orchestration-direct-so.robot:  instantiateVFWdirectso "
+   echo " "
+   echo " vnf-orchestration.robot: instantiate, instantiateNoDelete, stability72hr"
    exit
 fi
 
-export TAGS="-i $1"
-export ETEHOME=/var/opt/OpenECOMP_ETE
-export OUTPUT_FOLDER=ETE_$$
+set -x
+
+export NAMESPACE="$1"
+
+POD=$(kubectl --namespace $NAMESPACE get pods | sed 's/ .*//'| grep robot)
+
+
+TAGS="-i $2"
+
+ETEHOME=/var/opt/ONAP
+export GLOBAL_BUILD_NUMBER=$(kubectl --namespace $NAMESPACE exec  ${POD}  -- bash -c "ls -1q /share/logs/ | wc -l")
+OUTPUT_FOLDER=$(printf %04d $GLOBAL_BUILD_NUMBER)_ete_$2
+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"
 VARIABLES="-v GLOBAL_BUILD_NUMBER:$$"
 
-#docker exec openecompete_container ${ETEHOME}/runTags.sh ${VARIABLEFILES} ${VARIABLES} -d /share/logs/${OUTPUT_FOLDER} ${TAGS} --display 88
-
-POD=$(kubectl --namespace onap-robot get pods | sed 's/ .*//'| grep robot)
-kubectl --namespace onap-robot exec ${POD} -- ${ETEHOME}/runTags.sh ${VARIABLEFILES} ${VARIABLES} -d /share/logs/${OUTPUT_FOLDER} ${TAGS} --display 88
+kubectl --namespace $NAMESPACE exec ${POD} -- ${ETEHOME}/runTags.sh ${VARIABLEFILES} ${VARIABLES} -d /share/logs/${OUTPUT_FOLDER} ${TAGS} --display $DISPLAY_NUM