From: peusterm <manuel.peuster@uni-paderborn.de>
Date: Wed, 25 Oct 2017 13:53:41 +0000 (+0200)
Subject: Extended stage_2 pipeline: Allow unittests
X-Git-Tag: v3.0.0rc14~1^2
X-Git-Url: https://osm.etsi.org/gitweb/?a=commitdiff_plain;h=9f61130b63ff91366f663a8779b0a3f455ad32a9;p=osm%2Fdevops.git

Extended stage_2 pipeline: Allow unittests
to be executed in a privileged container by specifing
additional arguments for the Jenkins Docker plugin.

Required by vim-emu.

Change-Id: I46795e1e52259819c171a8ee03d626179a7e81f2
Signed-off-by: peusterm <manuel.peuster@uni-paderborn.de>
---

diff --git a/jenkins/ci-pipelines/ci_stage_2.groovy b/jenkins/ci-pipelines/ci_stage_2.groovy
index 5a5643d4..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,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"
 
@@ -52,7 +52,7 @@ def ci_pipeline(mdg,url_prefix,project,branch,refspec,revision,build_system,arti
         sh "docker build -t ${container_name} ."
     }
 
-    withDockerContainer("${container_name}") {
+    withDockerContainer(image: "${container_name}", args: docker_args) {
         stage('Test') {
             sh 'devops-stages/stage-test.sh'
         }