projects
/
osm
/
devops.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Revert "BUG 410 -- update to new platform"
[osm/devops.git]
/
jenkins
/
ci-pipelines
/
ci_stage_2.groovy
diff --git
a/jenkins/ci-pipelines/ci_stage_2.groovy
b/jenkins/ci-pipelines/ci_stage_2.groovy
index
5a5643d
..
68d221f
100644
(file)
--- a/
jenkins/ci-pipelines/ci_stage_2.groovy
+++ b/
jenkins/ci-pipelines/ci_stage_2.groovy
@@
-26,7
+26,7
@@
def project_checkout(url_prefix,project,refspec,revision) {
}
}
}
}
-def ci_pipeline(mdg,url_prefix,project,branch,refspec,revision,build_system,artifactory_server) {
+def ci_pipeline(mdg,url_prefix,project,branch,refspec,revision,build_system,artifactory_server
,docker_args=""
) {
println("build_system = ${build_system}")
ci_helper = load "devops/jenkins/ci-pipelines/ci_helper.groovy"
println("build_system = ${build_system}")
ci_helper = load "devops/jenkins/ci-pipelines/ci_helper.groovy"
@@
-52,7
+52,7
@@
def ci_pipeline(mdg,url_prefix,project,branch,refspec,revision,build_system,arti
sh "docker build -t ${container_name} ."
}
sh "docker build -t ${container_name} ."
}
- withDockerContainer(
"${container_name}"
) {
+ withDockerContainer(
image: "${container_name}", args: docker_args
) {
stage('Test') {
sh 'devops-stages/stage-test.sh'
}
stage('Test') {
sh 'devops-stages/stage-test.sh'
}