diff options
| -rwxr-xr-x | demo-k8s.sh | 2 | ||||
| -rwxr-xr-x | ete-k8s.sh | 12 | ||||
| -rw-r--r-- | etescripts/README | 1 | ||||
| -rw-r--r-- | values.yaml | 2 |
4 files changed, 14 insertions, 3 deletions
diff --git a/demo-k8s.sh b/demo-k8s.sh index 84de270..9b98c87 100755 --- a/demo-k8s.sh +++ b/demo-k8s.sh @@ -218,6 +218,6 @@ export GLOBAL_BUILD_NUMBER=$(kubectl --namespace $NAMESPACE exec ${POD} -- bas 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 +VARIABLEFILES="-V /share/config/vm_properties.py -V /share/config/integration_robot_properties.py" kubectl --namespace $NAMESPACE exec ${POD} -- ${ETEHOME}/runTags.sh ${VARIABLEFILES} ${VARIABLES} -d /share/logs/${OUTPUT_FOLDER} -i ${TAG} --display $DISPLAY_NUM 2> ${TAG}.out @@ -19,7 +19,7 @@ # Please clean up logs when you are done... # if [ "$1" == "" ] || [ "$2" == "" ]; then - echo "Usage: ete-k8s.sh [namespace] [tag]" + echo "Usage: ete-k8s.sh [namespace] [tag] [loadScript]" echo "" echo " List of test case tags (filename for intent: tag)" echo "" @@ -64,6 +64,16 @@ POD=$(kubectl --namespace $NAMESPACE get pods | sed 's/ .*//'| grep robot) TAGS="-i $2" +DIR=$(dirname "$0") +ETESCRIPTDIR=etescripts +ETESCRIPTEXEC=${3:-} + +if [[ "$2" == "ete" ]] && [[ "$ETESCRIPTEXEC" == "loadScript" ]]; then + for script in $(ls -1 "$DIR/$ETESCRIPTDIR"); do + [ -f "$DIR/$ETESCRIPTDIR/$script" ] && [ -x "$DIR/$ETESCRIPTDIR/$script" ] && "$DIR/$ETESCRIPTDIR/$script" + done +fi + 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 diff --git a/etescripts/README b/etescripts/README new file mode 100644 index 0000000..d620838 --- /dev/null +++ b/etescripts/README @@ -0,0 +1 @@ +Directory contains scripts that will be run before 'ete' robot testcases execution. diff --git a/values.yaml b/values.yaml index be75030..be35688 100644 --- a/values.yaml +++ b/values.yaml @@ -22,7 +22,7 @@ global: # global defaults # application image repository: nexus3.onap.org:10001 -image: onap/testsuite:1.5.0-STAGING-latest +image: onap/testsuite:1.5.0 pullPolicy: Always ubuntuInitImage: oomk8s/ubuntu-init:2.0.0 |