Revert "Setup and pass return information server"

This reverts commit df51573f.

Unfortunately, the test system shall not rely on IPv6 connectivity of
the VM. Other way to get data from the instance shall be explored.

software/cdn-test/in-vm-test

@@ -11,11 +11,10 @@
 # it in text form with data-to-vm
 #
 # Format of data-to-vm is shell script:
-#  SCRIPTURL=<url>\nPOSTURL=<url>\nWAITTIME=<seconds>\nTRIES=<amount>
+#  URL=<url>\nWAITTIME=<seconds>\nTRIES=<amount>
 #
 # Expected values in configuration:
-#  * SCRIPTURL - the url of the script to download and test
-#  * POSTURL - the url to which results will be posted
+#  * URL - the url of the script to download and test
 #  * WAITTIME - waiting time, before next try
 #  * TRIES - amount of tries
 
@@ -34,13 +33,8 @@ if [ -z "$LOG_FILE" ] ; then
   exit 1
 fi
 
-if [ -z "$SCRIPTURL" ] ; then
-  echo "SCRIPTURL is missing" >> $LOG_FILE 2>&1
-  exit 1
-fi
-
-if [ -z "$POSTURL" ] ; then
-  echo "POSTURL is missing" >> $LOG_FILE 2>&1
+if [ -z "$URL" ] ; then
+  echo "URL is missing" >> $LOG_FILE 2>&1
   exit 1
 fi
 
@@ -55,7 +49,7 @@ if [ -z "$TRIES" ] ; then
 fi
 
 DEPLOYMENT_SCRIPT=/tmp/test-script-deployment.bash.$$
-wget -O $DEPLOYMENT_SCRIPT -q $SCRIPTURL
+wget -O $DEPLOYMENT_SCRIPT -q $URL
 
 if [[ ! -s "$DEPLOYMENT_SCRIPT" ]] ; then
   echo "exit 1" > $DEPLOYMENT_SCRIPT
@@ -83,5 +77,5 @@ done
 echo "$0: Try $try. Uploading log and exiting with $result." >> $LOG_FILE 2>&1
 t=`date '+%Y%m%d%H%S'`
 mv $LOG_FILE ${LOG_FILE}.$t
-curl -q -X POST --data-urlencode "path=log-file.log.$t" --data-urlencode "content@${LOG_FILE}.$t" $POSTURL
+curl -q -X POST --data-urlencode "path=test-script-result/log-file.log.$t" --data-urlencode "content@${LOG_FILE}.$t" http://10.0.2.100/
 exit $result

software/cdn-test/instance-cdn-test.cfg.jinja2

@@ -8,8 +8,6 @@ offline = true
 parts =
   request-kvm
   deploy-unit-test
-  httpd
-  httpd-promise
 
 [request-kvm]
 <= slap-connection
@@ -30,29 +28,13 @@ config-bootstrap-script-url = {{ in_vm_test_script }}#{{ in_vm_test_script_md5 }
 
 # Script configuration
 config-data-to-vm =
-  SCRIPTURL={{ script_url }}
-  POSTURL=http://[${httpd:host}]:${httpd:port}/test-result/
+  URL={{ script_url }}
   WAITTIME={{ waittime }}
   TRIES={{ tries }}
 
 # require HTTP server
 config-enable-http-server = true
 
-[httpd]
-recipe = slapos.cookbook:simplehttpserver
-host = ${slap-network-information:global-ipv6}
-port = 8080
-base-path = ${directory:httpd}
-wrapper = ${directory:services}/http-server
-log-file = ${directory:log}/httpd.log
-use-hash-url = false
-
-[httpd-promise]
-recipe = slapos.cookbook:check_port_listening
-path = ${directory:promises}/httpd
-hostname = ${httpd:host}
-port = ${httpd:port}
-
 [directory]
 recipe = slapos.cookbook:mkdirectory
 home = ${buildout:directory}
@@ -64,8 +46,6 @@ tmp = ${:home}/tmp/
 log = ${:var}/log/
 services = ${:etc}/service/
 scripts = ${:etc}/run/
-httpd = ${:srv}/httpd/
-promises = ${:etc}/promise
 
 [deploy-unit-test]
 recipe = collective.recipe.template

software/cdn-test/software.cfg

@@ -20,7 +20,7 @@ recipe = slapos.recipe.download
 ignore-existing = true
 filename = in-vm-test
 url = ${:_profile_base_location_}/${:filename}
-md5sum = f8086c4d70af5afe0b3d1c00ea3ef437
+md5sum = 13f10035a3008cffb55d23a7dd069861
 mode = 0644
 download-only = true
 on-update = true
@@ -39,7 +39,7 @@ mode = 0644
 recipe = hexagonit.recipe.download
 ignore-existing = true
 url = ${:_profile_base_location_}/instance-cdn-test.cfg.jinja2
-md5sum = fea044e27b45707389d95b629132cdca
+md5sum = 8711cdffa7c40b3e1c7d9b76217a0f8a
 mode = 0644
 download-only = true
 on-update = true