software/erp5testnode/testsuite/deploy-test: Allow arbitrary bash code.

Move hardcoded values to default values.
Source the whole content of the data-to-vm parameter.

software/erp5testnode/testsuite/deploy-test/buildout.hash.cfg

@@ -14,8 +14,8 @@
 # not need these here).
 [deploy-script-controller-script]
 filename = deploy-script-controller
-md5sum = 6b2a293a38cf3ab69eba8d24fa1a8ea1
+md5sum = 00bceb73d800806c100312ee027dcdcf
 
 [template-deploy-test]
 filename = instance.cfg.in
-md5sum = 1faa52013b12b1753bcaff0b1309ad90
+md5sum = ba11521137356f4361b7d3d304f8fc0c

software/erp5testnode/testsuite/deploy-test/deploy-script-controller

@@ -38,15 +38,10 @@ if [ -z "$URL" ] ; then
   exit 1
 fi
 
-if [ -z "$WAITTIME" ] ; then
-  echo "WAITTIME missing" >> $LOG_FILE 2>&1
-  exit 1
-fi
-
-if [ -z "$TRIES" ] ; then
-  echo "TRIES missing" >> $LOG_FILE 2>&1
-  exit 1
-fi
+export WAITTIME=${WAITTIME:-360}
+echo "INFO: WAITTIME is $WAITTIME" >> "$LOG_FILE" 2>&1
+export TRIES=${TRIES:-80}
+echo "INFO: TRIES is $TRIES" >> "$LOG_FILE" 2>&1
 
 DEPLOYMENT_SCRIPT=/tmp/test-script-deployment.bash."$$"
 wget -O "$DEPLOYMENT_SCRIPT" -q "$URL"
@@ -89,7 +84,6 @@ function upload ()
 try=1
 while true; do
   echo "$0: Try $try. Running '/bin/bash $DEPLOYMENT_SCRIPT'" >> "$LOG_FILE" 2>&1
-  export TEST_YML_PATH
   /bin/bash "$DEPLOYMENT_SCRIPT" >> "$LOG_FILE" 2>&1
   result="$?"
   if [ "$result" == 0 ] ; then

software/erp5testnode/testsuite/deploy-test/instance-deploy-test.cfg.jinja2

@@ -2,8 +2,7 @@
 {% set test_type = slapparameter_dict.get('test-type', 'script-from-url') -%}
 {# Choose parameters according to test type -#}
 {% if test_type == 'script-from-url' -%}
-{% set script_url = slapparameter_dict.get('script-to-test-url') -%}
-{% set test_yml_path = '/not/required' -%}
+{% set data_to_vm = slapparameter_dict.get('data-to-vm') -%}
 {% elif test_type == 'cloned-playbook' -%}
 {% set script_url = 'http://10.0.2.100/standalone-local-playbook' -%}
 {% set test_yml_path = slapparameter_dict.get('yml-path-to-test') -%}
@@ -38,10 +37,7 @@ config-bootstrap-script-url = {{ in_vm_test_script }}#{{ in_vm_test_script_md5 }
 
 # Script configuration
 config-data-to-vm =
-  URL={{ script_url }}
-  WAITTIME={{ waittime }}
-  TRIES={{ tries }}
-  TEST_YML_PATH={{ test_yml_path }}
+  {{ data_to_vm }}
 
 # require HTTP server
 config-enable-http-server = true

software/erp5testnode/testsuite/deploy-test/instance.cfg.in

@@ -48,8 +48,6 @@ context =
     raw bin_directory ${buildout:bin-directory}
     raw in_vm_test_script ${deploy-script-controller-script:location}
     raw in_vm_test_script_md5 ${deploy-script-controller-script:md5sum}
-    raw waittime ${deploy-script-controller-script:waittime}
-    raw tries ${deploy-script-controller-script:tries}
     section test_image_repository test-image-repository
 
 [test-image-repository]

software/erp5testnode/testsuite/deploy-test/software.cfg

@@ -43,9 +43,6 @@ output = ${buildout:directory}/template-original.kvm.cfg
 
 [deploy-script-controller-script]
 location = ${:_profile_base_location_}/${:filename}
-# configuration
-waittime = 360
-tries = 80
 
 [standalone-local-playbook]
 filename = standalone-local-playbook