Revert "[CI] Use internal-ci/internal-eu cdn"
This reverts commit de909eaae267e89f0cb4558897d0366a2ff760e3.
Reason for revert: Start use public-ci for os offline
Change-Id: I6a2e65868016607cd0964a9332fea8d0f5352ef3
diff --git a/src/com/mirantis/mk/KaasUtils.groovy b/src/com/mirantis/mk/KaasUtils.groovy
index 3300bc3..c6a5651 100644
--- a/src/com/mirantis/mk/KaasUtils.groovy
+++ b/src/com/mirantis/mk/KaasUtils.groovy
@@ -449,7 +449,8 @@
if (commitMsg ==~ /(?s).*\[internal-ntp\].*/ || env.GERRIT_EVENT_COMMENT_TEXT ==~ /(?s).*internal-ntp\.*/ || proxyConfig['mgmtOffline'] || proxyConfig['childOffline']) {
configureInternalNTP = true
- common.warningMsg('Internal NTP servers will be used')
+ openstackIMC = 'eu'
+ common.warningMsg('Internal NTP servers will be used. Forced deployment for an offline case in eu cloud')
}
if (commitMsg ==~ /(?s).*\[disable-kube-api-audit\].*/ || env.GERRIT_EVENT_COMMENT_TEXT ==~ /(?s).*disable-kube-api-audit\.*/) {
@@ -532,8 +533,8 @@
// CDN configuration
def cdnConfig = [
mgmt: [
- openstack: 'internal-ci',
- vsphere: 'internal-ci',
+ openstack: (proxyConfig['mgmtOffline'] == true) ? 'public-ci' : 'internal-ci',
+ vsphere: (proxyConfig['mgmtOffline'] == true) ? 'public-ci' : 'internal-eu',
aws: 'public-ci',
equinix: 'public-ci',
azure: 'public-ci',
@@ -546,7 +547,8 @@
if (openstackIMC == 'eu') {
// use internal-eu because on internal-ci with eu cloud image pull takes much time
- def cdnRegion = 'internal-eu'
+ def cdnRegion = (proxyConfig['mgmtOffline'] == true) ? 'public-ci' : 'internal-eu'
+ common.infoMsg("eu-demo was triggered, force switching CDN region to ${cdnRegion}")
cdnConfig['mgmt']['openstack'] = cdnRegion
}