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_3.groovy
diff --git
a/jenkins/ci-pipelines/ci_stage_3.groovy
b/jenkins/ci-pipelines/ci_stage_3.groovy
index
ba406e5
..
082f728
100644
(file)
--- a/
jenkins/ci-pipelines/ci_stage_3.groovy
+++ b/
jenkins/ci-pipelines/ci_stage_3.groovy
@@
-40,8
+40,6
@@
node("${params.NODE}") {
sh 'env'
tag_or_branch = params.GERRIT_BRANCH.replaceAll(/\./,"")
sh 'env'
tag_or_branch = params.GERRIT_BRANCH.replaceAll(/\./,"")
- container_name_prefix = "osm-${tag_or_branch}"
- container_name = "${container_name_prefix}-${BUILD_NUMBER}"
stage("Checkout") {
checkout scm
stage("Checkout") {
checkout scm
@@
-52,11
+50,16
@@
node("${params.NODE}") {
def upstream_main_job = params.UPSTREAM_SUFFIX
def save_artifacts = false
def upstream_main_job = params.UPSTREAM_SUFFIX
def save_artifacts = false
+ // upstream jobs always use merged artifacts
+ upstream_main_job += '-merge'
+ container_name_prefix = "osm-${tag_or_branch}"
+ container_name = "${container_name_prefix}"
if ( JOB_NAME.contains('merge') ) {
if ( JOB_NAME.contains('merge') ) {
- upstream_main_job += '-merge'
save_artifacts = true
println("merge job, saving artifacts")
save_artifacts = true
println("merge job, saving artifacts")
+ container_name += "-merge"
}
}
+ container_name += "-${BUILD_NUMBER}"
// Copy the artifacts from the upstream jobs
stage("Copy Artifacts") {
// Copy the artifacts from the upstream jobs
stage("Copy Artifacts") {