Merge "Added possibility of disabling CI tests for some cluster levels"
diff --git a/aptly-promote-pipeline.groovy b/aptly-promote-pipeline.groovy
index c196ccd..31390b0 100644
--- a/aptly-promote-pipeline.groovy
+++ b/aptly-promote-pipeline.groovy
@@ -43,6 +43,8 @@
throw e
} finally {
common.sendNotification(currentBuild.result,"",["slack"])
+ def _extra_descr = "${SOURCE}=>${TARGET}:\n${COMPONENTS} ${packages}"
+ currentBuild.description = currentBuild.description ? _extra_descr + " " + currentBuild.description : _extra_descr
}
}
-}
\ No newline at end of file
+}
diff --git a/generate-cookiecutter-products.groovy b/generate-cookiecutter-products.groovy
index 6b76088..1fa3c43 100644
--- a/generate-cookiecutter-products.groovy
+++ b/generate-cookiecutter-products.groovy
@@ -121,15 +121,15 @@
stage('Generate new SaltMaster node') {
def nodeFile = "${modelEnv}/nodes/${saltMaster}.${clusterDomain}.yml"
def nodeString = """classes:
- - cluster.${clusterName}.infra.config
- parameters:
- _param:
- linux_system_codename: xenial
- reclass_data_revision: master
- linux:
- system:
- name: ${saltMaster}
- domain: ${clusterDomain}
+- cluster.${clusterName}.infra.config
+parameters:
+ _param:
+ linux_system_codename: xenial
+ reclass_data_revision: master
+ linux:
+ system:
+ name: ${saltMaster}
+ domain: ${clusterDomain}
"""
sh "mkdir -p ${modelEnv}/nodes/"
writeFile(file: nodeFile, text: nodeString)