From: marchettim <mmarchetti@sandvine.com>
Date: Sat, 9 Sep 2017 20:18:37 +0000 (+0200)
Subject: Merge "Make artifactory server configurable in Jenkins build"
X-Git-Tag: v3.0.0rc~10
X-Git-Url: https://osm.etsi.org/gitweb/?a=commitdiff_plain;h=42368e26851ef17f528a7cb9ad92b7b60993c0c4;hp=-c;p=osm%2Fdevops.git

Merge "Make artifactory server configurable in Jenkins build"
---

42368e26851ef17f528a7cb9ad92b7b60993c0c4
diff --combined jenkins/ci-pipelines/ci_stage_2.groovy
index 7fca49d1,d90ee2b2..5a5643d4
--- a/jenkins/ci-pipelines/ci_stage_2.groovy
+++ b/jenkins/ci-pipelines/ci_stage_2.groovy
@@@ -26,7 -26,7 +26,7 @@@ def project_checkout(url_prefix,project
      }
  }
  
- 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) {
      println("build_system = ${build_system}")
      ci_helper = load "devops/jenkins/ci-pipelines/ci_helper.groovy"
  
@@@ -45,14 -45,16 +45,14 @@@
      container_name = "${project}-${branch}".toLowerCase()
  
      stage('Docker-Build') {
 +        sh '''
 +           echo RUN groupadd -o -g $(id -g) -r jenkins >> Dockerfile
 +           echo RUN useradd -o -u $(id -u) --create-home -r -g  jenkins jenkins >> Dockerfile
 +           '''
          sh "docker build -t ${container_name} ."
      }
  
      withDockerContainer("${container_name}") {
 -        stage('Docker-Setup') {
 -            sh '''
 -               groupadd -o -g $(id -g) -r jenkins
 -               useradd -o -u $(id -u) --create-home -r -g  jenkins jenkins
 -               '''
 -        }
          stage('Test') {
              sh 'devops-stages/stage-test.sh'
          }
@@@ -63,7 -65,7 +63,7 @@@
  
      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 ) {