projects
/
osm
/
devops.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
check test_install for devops 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
45bf777
..
5a5643d
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) {
+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"
println("build_system = ${build_system}")
ci_helper = load "devops/jenkins/ci-pipelines/ci_helper.groovy"
@@
-45,8
+45,10
@@
def ci_pipeline(mdg,url_prefix,project,branch,refspec,revision,build_system) {
container_name = "${project}-${branch}".toLowerCase()
stage('Docker-Build') {
container_name = "${project}-${branch}".toLowerCase()
stage('Docker-Build') {
- sh "echo 'RUN groupadd -o -g " + "id -g".execute().text + " -r jenkins \\' >> Dockerfile"
- sh "echo ' && useradd -o -u " + "id -u".execute().text + " --create-home -r -g jenkins jenkins' >> Dockerfile"
+ 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} ."
}
sh "docker build -t ${container_name} ."
}
@@
-61,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()
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 ) {
}
if ( build_system ) {