summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMike Elliott <mike.elliott@amdocs.com>2018-04-25 16:48:06 +0000
committerGerrit Code Review <gerrit@onap.org>2018-04-25 16:48:06 +0000
commit0d67ecc503008e2c3dc6038fb01645ecfe818496 (patch)
tree2a0b8c9b2a1d203f850b1dd743eddb7b8e70bbfd
parent21d014998ed7e14ab99bcf9bc9ce7f8751247bfd (diff)
parent6b89ba090c61c315565a751346ca9979a9c9d63c (diff)
Merge "Synch ete-k8s.sh and ete.sh"
-rwxr-xr-xkubernetes/robot/ete-k8s.sh12
1 files changed, 10 insertions, 2 deletions
diff --git a/kubernetes/robot/ete-k8s.sh b/kubernetes/robot/ete-k8s.sh
index 71e2027e4a..b1a7283d80 100755
--- a/kubernetes/robot/ete-k8s.sh
+++ b/kubernetes/robot/ete-k8s.sh
@@ -10,13 +10,21 @@ if [ "$1" == "" ] || [ "$2" == "" ]; then
exit
fi
+
export NAMESPACE="$1"
+
+POD=$(kubectl --namespace $NAMESPACE get pods | sed 's/ .*//'| grep robot)
+
+
export TAGS="-i $2"
export ETEHOME=/var/opt/OpenECOMP_ETE
-export OUTPUT_FOLDER=ETE_$$
+export GLOBAL_BUILD_NUMBER=$(kubectl --namespace $NAMESPACE exec ${POD} -- bash -c "ls -1q /share/logs/ | wc -l")
+export OUTPUT_FOLDER=ETE_$(printf %04d $GLOBAL_BUILD_NUMBER)_$2
+
+#export OUTPUT_FOLDER=ETE_$$
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:$$"
-POD=$(kubectl --namespace $NAMESPACE get pods | sed 's/ .*//'| grep robot)
kubectl --namespace $NAMESPACE exec ${POD} -- ${ETEHOME}/runTags.sh ${VARIABLEFILES} ${VARIABLES} -d /share/logs/${OUTPUT_FOLDER} ${TAGS} --display 88
+