projects
/
osm
/
devops.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Enable docker builds in stage_3
[osm/devops.git]
/
jenkins
/
ci-pipelines
/
ci_helper.groovy
diff --git
a/jenkins/ci-pipelines/ci_helper.groovy
b/jenkins/ci-pipelines/ci_helper.groovy
index
9708b1c
..
32967f5
100644
(file)
--- a/
jenkins/ci-pipelines/ci_helper.groovy
+++ b/
jenkins/ci-pipelines/ci_helper.groovy
@@
-75,11
+75,13
@@
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)
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
{
}
else
{
- lxc_run(container_name, "make -C devops/systest OSM_HOSTNAME=${so_ip} OSM_RO_HOSTNAME=${ro_ip} ${test}")
+ result = lxc_run(container_name, "make -C devops/systest OSM_HOSTNAME=${so_ip} OSM_RO_HOSTNAME=${ro_ip} ${test}")
+ echo result
}
lxc_get_file(container_name, "/root/devops/systest/reports/pytest-${test}.xml",'.')
}
}
lxc_get_file(container_name, "/root/devops/systest/reports/pytest-${test}.xml",'.')
}