X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=jenkins%2Fci-pipelines%2Fci_helper.groovy;h=a2ededc52acb94e732e9f2b3be1ccf8e78b74a7a;hb=cd00aada754a0ab3fc0a4839846d7ffaf559bea9;hp=94e1b705332e37b6491603680b3ce0244fb60f07;hpb=34b892a25173619996492dd037643af146235894;p=osm%2Fdevops.git

diff --git a/jenkins/ci-pipelines/ci_helper.groovy b/jenkins/ci-pipelines/ci_helper.groovy
index 94e1b705..a2ededc5 100644
--- a/jenkins/ci-pipelines/ci_helper.groovy
+++ b/jenkins/ci-pipelines/ci_helper.groovy
@@ -55,10 +55,10 @@ def lxc_file_push(container_name,file,destination) {
 
 // start a http server
 // return the http server URL
-def start_http_server(repo_dir,server_name) {
-    sh "docker run -dit --name ${server_name} -v ${repo_dir}:/usr/local/apache2/htdocs/ httpd:2.4"
+def start_http_server(repo_dir,server_name,port) {
+    sh "docker run -dit --name ${server_name} -p ${port}:80 -v ${repo_dir}:/usr/local/apache2/htdocs/ httpd:2.4"
     def http_server_ip = sh(returnStdout:true,  script: "docker inspect --format '{{ .NetworkSettings.IPAddress }}' ${server_name}").trim()
-    return "-u http://${http_server_ip}/"
+    return "http://${http_server_ip}/"
 }
 
 def lxc_get_file(container_name,file,destination) {
@@ -75,7 +75,8 @@ def systest_run(container_name, test, source_rc = null) {
         pre_source = "/tmp/" + source_rc.substring(source_rc.lastIndexOf('/')+1)
  
         lxc_file_push(container_name,source_rc,pre_source)
-        lxc_run(container_name, "sh -c '. ${pre_source}; make -C devops/systest OSM_HOSTNAME=${so_ip} OSM_RO_HOSTNAME=${ro_ip} ${test}'")
+        result = lxc_run(container_name, "sh -c '. ${pre_source}; make -C devops/systest OSM_HOSTNAME=${so_ip} OSM_RO_HOSTNAME=${ro_ip} ${test}'")
+        echo result
     }
     else
     {