[feat][core] disable os-demo on demand
us: https://mirantis.jira.com/browse/PRODX-6963
Change-Id: Id79a37296ffdbfa3d0d1c593f9c37254ab77cf53
diff --git a/src/com/mirantis/mk/KaasUtils.groovy b/src/com/mirantis/mk/KaasUtils.groovy
index fde7ab0..7526697 100644
--- a/src/com/mirantis/mk/KaasUtils.groovy
+++ b/src/com/mirantis/mk/KaasUtils.groovy
@@ -55,7 +55,10 @@
def runMgmtConformance = env.RUN_MGMT_CFM ? env.RUN_MGMT_CFM.toBoolean() : false
def runChildConformance = env.RUN_CHILD_CFM ? env.RUN_CHILD_CFM.toBoolean() : false
def fetchServiceBinaries = env.FETCH_BINARIES_FROM_UPSTREAM ? env.FETCH_BINARIES_FROM_UPSTREAM.toBoolean() : false
+
+ // optional demo deployment customization
def awsOnDemandDemo = env.ALLOW_AWS_ON_DEMAND ? env.ALLOW_AWS_ON_DEMAND.toBoolean() : false
+ def enableOSDemo = true
def commitMsg = env.GERRIT_CHANGE_COMMIT_MESSAGE ? new String(env.GERRIT_CHANGE_COMMIT_MESSAGE.decodeBase64()) : ''
if (commitMsg ==~ /(?s).*\[child-deploy\].*/ || env.GERRIT_EVENT_COMMENT_TEXT ==~ /(?s).*child-deploy.*/ || upgradeChild || runChildConformance) {
@@ -83,7 +86,11 @@
}
if (commitMsg ==~ /(?s).*\[aws-demo\].*/ || env.GERRIT_EVENT_COMMENT_TEXT ==~ /(?s).*aws-demo.*/) {
awsOnDemandDemo = true
- common.warningMsg('Forced running additional kaas deployment with AWS provider, triggered on patchset using custom keyword: \'aws-demo\' ')
+ common.warningMsg('Forced running additional kaas deployment with AWS provider, triggered on patchset using custom keyword: \'[aws-demo]\' ')
+ }
+ if (commitMsg ==~ /(?s).*\[disable-os-demo\].*/ || env.GERRIT_EVENT_COMMENT_TEXT ==~ /(?s).*disable-os-demo\.*/) {
+ enableOSDemo = false
+ common.errorMsg('Openstack demo deployment will be aborted, VF -1 will be set')
}
// TODO (vnaumov) remove below condition after moving all releases to UCP
@@ -104,7 +111,8 @@
Mgmt cluster release upgrade scheduled: ${upgradeMgmt}
Mgmt conformance testing scheduled: ${runMgmtConformance}
Mgmt UI e2e testing scheduled: ${runUie2e}
- AWS provider additional deployment scheduled: ${awsOnDemandDemo}
+ AWS provider deployment scheduled: ${awsOnDemandDemo}
+ OS provider deployment scheduled: ${enableOSDemo}
Service binaries fetching scheduled: ${fetchServiceBinaries}
Triggers: https://docs.google.com/document/d/1SSPD8ZdljbqmNl_FEAvTHUTow9Ki8NIMu82IcAVhzXw/""")
return [
@@ -115,7 +123,8 @@
runUie2eEnabled : runUie2e,
runMgmtConformanceEnabled : runMgmtConformance,
fetchServiceBinariesEnabled: fetchServiceBinaries,
- awsOnDemandDemoEnabled : awsOnDemandDemo]
+ awsOnDemandDemoEnabled : awsOnDemandDemo,
+ osDemoEnabled : enableOSDemo]
}
/**