diff options
| author |   Gary Wu <gary.i.wu@huawei.com> | 2018-11-01 11:57:27 -0700 |
|---|---|---|
| committer | Gary Wu <gary.i.wu@huawei.com> | 2018-11-01 11:57:27 -0700 |
| commit | 4ec2c6783cd4ad4efbaa30ad6e4e9fad969f52f5 (patch) | |
| tree | f93cab1b11b7f27c7ab30bb1d8659a913ee5add3 | |
| parent | c506b7cf87e92abff8fdc31fc9e92d4cac0352be (diff) | |
Stop overwriting demo.sh test output logs
Generate sequential output log directories for
demo.sh just like for ete.sh.
Change-Id: I67f8d5f6c9f38625c0024ad5a8d54349a52046db
Issue-ID: INT-586
Signed-off-by: Gary Wu <gary.i.wu@huawei.com>
| -rwxr-xr-x | kubernetes/robot/demo-k8s.sh | 12 | ||||
| -rwxr-xr-x | kubernetes/robot/ete-k8s.sh | 13 |
2 files changed, 16 insertions, 9 deletions
diff --git a/kubernetes/robot/demo-k8s.sh b/kubernetes/robot/demo-k8s.sh index 79d545b2be..971c0c4ca4 100755 --- a/kubernetes/robot/demo-k8s.sh +++ b/kubernetes/robot/demo-k8s.sh @@ -174,7 +174,15 @@ 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 + diff --git a/kubernetes/robot/ete-k8s.sh b/kubernetes/robot/ete-k8s.sh index 22b83e8545..7726c12bdc 100755 --- a/kubernetes/robot/ete-k8s.sh +++ b/kubernetes/robot/ete-k8s.sh @@ -31,15 +31,14 @@ export NAMESPACE="$1" POD=$(kubectl --namespace $NAMESPACE get pods | sed 's/ .*//'| grep robot) -export TAGS="-i $2" -export ETEHOME=/var/opt/OpenECOMP_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 +TAGS="-i $2" -#export OUTPUT_FOLDER=ETE_$$ +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)_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:$$" -kubectl --namespace $NAMESPACE 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 |