summaryrefslogtreecommitdiffstats
path: root/kubernetes
diff options
context:
space:
mode:
authorBrian Freeman <bf1936@att.com>2018-04-23 20:54:13 -0500
committerBrian Freeman <bf1936@att.com>2018-04-23 20:54:50 -0500
commit6b89ba090c61c315565a751346ca9979a9c9d63c (patch)
tree3a366aa7b6289b96f2f6681000f288e52473f610 /kubernetes
parent8f72e1e58c389603efa0aa2ae178e1cf3218a2b7 (diff)
Synch ete-k8s.sh and ete.sh
Issue-ID: OOM-989 Change-Id: I8db1ea5919d15d4213367cf1acca7b2e63651355 Signed-off-by: Brian Freeman <bf1936@att.com>
Diffstat (limited to 'kubernetes')
-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
+