println("retrieve archive for ${mdg}/${branch}/${build_name}/${build_number}/${pattern}")
+ // if the build name does not contain merge, then this is a patchset/staging job
+ if (!build_name.contains('merge')) {
+ branch += '-staging'
+ }
def repo_prefix = 'osm-'
def downloadSpec = """{
"files": [
{
"target": "./",
- "pattern": "${repo_prefix}${mdg}/${pattern}",
+ "pattern": "${repo_prefix}${mdg}/${branch}/${build_number}/${pattern}",
"build": "${build_name}/${build_number}"
}
]
}"""
server.download(downloadSpec)
- // workaround. flatten and repo the specific build num from the directory
- sh "cp -R ${build_num}/* ."
- sh "rm -rf ${build_num}"
+ // workaround. flatten repo to remove specific build num from the directory
+ sh "cp -R ${branch}/${build_num}/* ."
+ sh "rm -rf ${branch}/${build_num}"
}
def get_env_value(build_env_file,key) {
return sh(returnStdout: true, script: "lxc exec ${container_name} -- ${cmd}").trim()
}
+def lxc_file_push(container_name,file,destination) {
+ return sh(returnStdout: true, script: "lxc file push ${file} ${container_name}/${destination}").trim()
+}
+
// start a http server
// return the http server URL
def start_http_server(repo_dir,server_name) {
sh "lxc file pull ${container_name}/${file} ${destination}"
}
-def systest_run(container_name, test) {
+def systest_run(container_name, test, source_rc = null) {
// need to get the SO IP inside the running container
so_ip = lxc_run(container_name,"lxc list SO-ub -c 4|grep eth0 |awk '{print \$2}'")
+ ro_ip = lxc_run(container_name,"lxc list RO -c 4|grep eth0 |awk '{print \$2}'")
//container_ip = get_ip_from_container(container_name)
- //
- lxc_run(container_name, "make -C devops/systest OSM_HOSTNAME=${so_ip} ${test}")
+
+ if ( source_rc ) {
+ 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}'")
+ }
+ else
+ {
+ lxc_run(container_name, "make -C devops/systest OSM_HOSTNAME=${so_ip} OSM_RO_HOSTNAME=${ro_ip} ${test}")
+ }
lxc_get_file(container_name, "/root/devops/systest/reports/pytest-${test}.xml",'.')
}
def archive(artifactory_server,mdg,branch,status) {
server = Artifactory.server artifactory_server
- def properties = "branch=${branch};status=${status}"
+ def properties = ""
+ //def properties = "branch=${branch};status=${status}"
def repo_prefix = 'osm-'
+
+ // if the build name does not contain merge, then this is a patchset/staging job
+ if ( !JOB_NAME.contains('merge') ) {
+ branch += '-staging'
+ }
def uploadSpec = """{
"files": [
{
"pattern": "dists/*.gz",
- "target": "${repo_prefix}${mdg}/${BUILD_NUMBER}/",
+ "target": "${repo_prefix}${mdg}/${branch}/${BUILD_NUMBER}/",
"props": "${properties}",
"flat": false
},
{
"pattern": "dists/*Packages",
- "target": "${repo_prefix}${mdg}/${BUILD_NUMBER}/",
+ "target": "${repo_prefix}${mdg}/${branch}/${BUILD_NUMBER}/",
"props": "${properties}",
"flat": false
},
{
"pattern": "pool/*/*.deb",
- "target": "${repo_prefix}${mdg}/${BUILD_NUMBER}/",
+ "target": "${repo_prefix}${mdg}/${branch}/${BUILD_NUMBER}/",
+ "props": "${properties}",
+ "flat": false
+ },
+ {
+ "pattern": "changelog/*",
+ "target": "${repo_prefix}${mdg}/${branch}/${BUILD_NUMBER}/",
"props": "${properties}",
"flat": false
}]