Merge "[artifactory-replication] Add common function to generate command line from env vars"
diff --git a/src/com/mirantis/mcp/UpgradeChecks.groovy b/src/com/mirantis/mcp/UpgradeChecks.groovy
index 54d00f6..8b4279b 100644
--- a/src/com/mirantis/mcp/UpgradeChecks.groovy
+++ b/src/com/mirantis/mcp/UpgradeChecks.groovy
@@ -80,7 +80,8 @@
def common = new com.mirantis.mk.Common()
def waStatus = [prodId: "PROD-36461", isFixed: "", waInfo: ""]
if (!salt.testTarget(venvPepper, 'I@ceph:radosgw')) {
- return
+ waStatus.isFixed = 'Nothing to do. Ceph is not enabled.'
+ return waStatus
}
def clusterModelPath = "/srv/salt/reclass/classes/cluster/${cluster_name}"
def checkFile = "${clusterModelPath}/ceph/rgw.yml"
diff --git a/src/com/mirantis/mk/KaasUtils.groovy b/src/com/mirantis/mk/KaasUtils.groovy
index 27f03ca..0622967 100644
--- a/src/com/mirantis/mk/KaasUtils.groovy
+++ b/src/com/mirantis/mk/KaasUtils.groovy
@@ -367,7 +367,10 @@
}
// calculate weight of current demo run to manage lockable resources
- def demoWeight = deployChild ? 3 : 2 // management = 1 + 1 ui child, child += 1
+ def demoWeight = deployChild ? 2 : 1 // management = 1, child += 1
+ if (runUie2e) {
+ demoWeight += 1
+ }
if (commitMsg ==~ /(?s).*\[bootstrapv2-scenario\].*/ || env.GERRIT_EVENT_COMMENT_TEXT ==~ /(?s).*bootstrapv2-scenario\.*/) {
bootstrapV2Scenario = true