X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=jenkins%2Fci-pipelines%2Fci_stage_2.groovy;h=68d221f1dc94270183b1b54a13a94cf215495614;hb=refs%2Fchanges%2F61%2F5661%2F3;hp=7fca49d124d72c10ea7d519b6677c75451cd3455;hpb=d92834a7aa90e10ef67867d1e095ff0e01e871b4;p=osm%2Fdevops.git diff --git a/jenkins/ci-pipelines/ci_stage_2.groovy b/jenkins/ci-pipelines/ci_stage_2.groovy index 7fca49d1..68d221f1 100644 --- 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) { +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" @@ -52,7 +52,7 @@ def ci_pipeline(mdg,url_prefix,project,branch,refspec,revision,build_system) { sh "docker build -t ${container_name} ." } - withDockerContainer("${container_name}") { + withDockerContainer(image: "${container_name}", args: docker_args) { stage('Test') { sh 'devops-stages/stage-test.sh' } @@ -63,7 +63,7 @@ def ci_pipeline(mdg,url_prefix,project,branch,refspec,revision,build_system) { stage('Archive') { sh(returnStdout:true, script: 'devops-stages/stage-archive.sh').trim() - ci_helper.archive(mdg,branch,'untested') + ci_helper.archive(artifactory_server,mdg,branch,'untested') } if ( build_system ) {