projects
/
osm
/
devops.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
use job name for container name
[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
..
d51c298
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,docker_args=""
) {
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,12
+45,14
@@
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} ."
}
- withDockerContainer(
"${container_name}"
) {
+ withDockerContainer(
image: "${container_name}", args: docker_args
) {
stage('Test') {
sh 'devops-stages/stage-test.sh'
}
stage('Test') {
sh 'devops-stages/stage-test.sh'
}
@@
-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 ) {
@@
-72,9
+74,13
@@
def ci_pipeline(mdg,url_prefix,project,branch,refspec,revision,build_system) {
string(name: 'UPSTREAM_JOB_NAME', value: "${JOB_NAME}" ),
string(name: 'UPSTREAM_JOB_NUMBER', value: "${BUILD_NUMBER}" ),
]
string(name: 'UPSTREAM_JOB_NAME', value: "${JOB_NAME}" ),
string(name: 'UPSTREAM_JOB_NUMBER', value: "${BUILD_NUMBER}" ),
]
+ stage_3_job = "osm-stage_3"
+ if ( JOB_NAME.contains('merge') ) {
+ stage_3_job += '-merge'
+ }
- // callout to stage_3.
This is the system build
- result = build job: "
osm-stage_3
/${branch}", parameters: downstream_params_stage_3, propagate: true
+ // callout to stage_3. This is the system build
+ result = build job: "
${stage_3_job}
/${branch}", parameters: downstream_params_stage_3, propagate: true
if (result.getResult() != 'SUCCESS') {
project = result.getProjectName()
build = result.getNumber()
if (result.getResult() != 'SUCCESS') {
project = result.getProjectName()
build = result.getNumber()