projects
/
osm
/
devops.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge "Make artifactory server configurable in Jenkins build"
[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
d90ee2b
..
5a5643d
100644
(file)
--- a/
jenkins/ci-pipelines/ci_stage_2.groovy
+++ b/
jenkins/ci-pipelines/ci_stage_2.groovy
@@
-45,16
+45,14
@@
def ci_pipeline(mdg,url_prefix,project,branch,refspec,revision,build_system,arti
container_name = "${project}-${branch}".toLowerCase()
stage('Docker-Build') {
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}") {
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'
}
stage('Test') {
sh 'devops-stages/stage-test.sh'
}