projects
/
osm
/
devops.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge "Trim trailing slash from REPOSITORY_BASE before add-apt-repository"
[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
9ea2d7f
..
f9ca479
100644
(file)
--- a/
jenkins/ci-pipelines/ci_stage_3.groovy
+++ b/
jenkins/ci-pipelines/ci_stage_3.groovy
@@
-129,6
+129,12
@@
node("${params.NODE}") {
// copy the public key into the release folder
// this pulls the key from the home dir of the current user (jenkins)
sh "cp ~/${REPO_KEY_NAME} ."
// copy the public key into the release folder
// this pulls the key from the home dir of the current user (jenkins)
sh "cp ~/${REPO_KEY_NAME} ."
+
+ // merge the change logs
+ sh """
+ rm -f changelog/changelog-osm.html
+ [ ! -d changelog ] || for mdgchange in \$(ls changelog); do cat changelog/\$mdgchange >> changelog/changelog-osm.html; done
+ """
}
// start an apache server to serve up the images
http_server_name = "${container_name}-apache"
}
// start an apache server to serve up the images
http_server_name = "${container_name}-apache"