diff options
Diffstat (limited to 'kubernetes/robot')
| -rwxr-xr-x | kubernetes/robot/demo-k8s.sh | 12 | ||||
| -rwxr-xr-x | kubernetes/robot/ete-k8s.sh | 12 |
2 files changed, 19 insertions, 5 deletions
diff --git a/kubernetes/robot/demo-k8s.sh b/kubernetes/robot/demo-k8s.sh index d5e7a0384d..de3362740e 100755 --- a/kubernetes/robot/demo-k8s.sh +++ b/kubernetes/robot/demo-k8s.sh @@ -36,7 +36,11 @@ function usage } # Set the defaults -if [ $# -le 2 ];then + +echo "Number of parameters:" +echo $# + +if [ $# -lt 2 ];then usage exit fi @@ -47,9 +51,11 @@ shift ## ## if more than 1 tag is supplied, the must be provided with -i or -e ## -while [ $# -gt 1 ] +while [ $# -gt 0 ] do - key="$2" + key="$1" + echo "KEY:" + echo $key case $key in init_robot) 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 + |