Modify promotePublish to handle components and packages
Change-Id: I400ed2f5ce21eaf3be89f0605e05e85990ea1a7d
diff --git a/src/com/mirantis/mk/Aptly.groovy b/src/com/mirantis/mk/Aptly.groovy
index c1197a5..fdf0d27 100644
--- a/src/com/mirantis/mk/Aptly.groovy
+++ b/src/com/mirantis/mk/Aptly.groovy
@@ -73,12 +73,12 @@
}
def promotePublish(server, source, target, recreate=false, components=null, packages=null, diff=false, opts='-d --timeout 600') {
- if (components) {
- def componentsStr = components.join(' ')
+ if (components && components != "all" && components != "") {
+ def componentsStr = components.replaceAll(",", " ")
opts = "${opts} --components ${componentsStr}"
}
- if (packages) {
- def packagesStr = packages.join(' ')
+ if (packages && packages != "all" && packages != "") {
+ def packagesStr = packages.replaceAll(",", " ")
opts = "${opts} --packages ${packagesStr}"
}
if (recreate.toBoolean() == true) {
@@ -87,6 +87,7 @@
if (diff.toBoolean() == true) {
opts = "--dry --diff"
}
+
sh("aptly-publisher --url ${server} promote --source ${source} --target ${target} ${opts}")
}