Merge "Fix condition and pipeline name" into release/proposed/2019.2.0
diff --git a/cloud-deploy-pipeline.groovy b/cloud-deploy-pipeline.groovy
index 5159960..5f19480 100644
--- a/cloud-deploy-pipeline.groovy
+++ b/cloud-deploy-pipeline.groovy
@@ -342,10 +342,7 @@
// Install
//
if (!batch_size) {
- def workerThreads = salt.getReturnValues(salt.getPillar(venvPepper, "I@salt:master", "salt:master:worker_threads", null)).toString()
- if (workerThreads.isInteger() && workerThreads.toInteger() > 0) {
- batch_size = workerThreads
- }
+ batch_size = salt.getWorkerThreads(venvPepper)
}
// Check if all minions are reachable and ready
diff --git a/upgrade-mcp-release.groovy b/upgrade-mcp-release.groovy
index 7eb39b1..2770a07 100644
--- a/upgrade-mcp-release.groovy
+++ b/upgrade-mcp-release.groovy
@@ -356,10 +356,7 @@
error('Pillar data is broken for Salt master node! Please check it manually and re-run pipeline.')
}
if (!batchSize) {
- def workerThreads = salt.getReturnValues(salt.getPillar(venvPepper, "I@salt:master", "salt:master:worker_threads", null)).toString()
- if (workerThreads.isInteger() && workerThreads.toInteger() > 0) {
- batchSize = workerThreads
- }
+ batchSize = salt.getWorkerThreads(venvPepper)
}
stage('Update Reclass and Salt-Formulas') {