Merge "[CI] BM demo trigger demo"
diff --git a/src/com/mirantis/mk/KaasUtils.groovy b/src/com/mirantis/mk/KaasUtils.groovy
index 43fd71e..f006b4c 100644
--- a/src/com/mirantis/mk/KaasUtils.groovy
+++ b/src/com/mirantis/mk/KaasUtils.groovy
@@ -223,7 +223,6 @@
if (commitMsg ==~ /(?s).*\[deploy-os-on-mos\].*/ || env.GERRIT_EVENT_COMMENT_TEXT ==~ /(?s).*deploy-os-on-mos.*/) {
deployOsOnMos = true
mosDeployChild = true
- openstackIMC = 'eu2'
}
if (commitMsg ==~ /(?s).*\[half-virtual\].*/ || env.GERRIT_EVENT_COMMENT_TEXT ==~ /(?s).*half-virtual.*/ || upgradeMgmt) {
@@ -514,13 +513,10 @@
if (commitMsg ==~ /(?s).*\[eu-demo\].*/ || env.GERRIT_EVENT_COMMENT_TEXT ==~ /(?s).*eu-demo.*/) {
openstackIMC = 'eu'
}
- if (commitMsg ==~ /(?s).*\[mos-tf-demo\].*/ || env.GERRIT_EVENT_COMMENT_TEXT ==~ /(?s).*mos-tf-demo.*/) {
- openstackIMC = 'eu2'
- }
- if (openstackIMC == 'eu' || openstackIMC == 'eu2') {
+
+ if (openstackIMC == 'eu') {
// use internal-eu because on internal-ci with eu cloud image pull takes much time
def cdnRegion = 'internal-eu'
- common.infoMsg("eu2-demo was triggered, force switching CDN region to ${cdnRegion}")
cdnConfig['mgmt']['openstack'] = cdnRegion
}