Merge "Add trigger for ui test on vsphere"
diff --git a/src/com/mirantis/mk/KaasUtils.groovy b/src/com/mirantis/mk/KaasUtils.groovy
index 6b2dccf..845f3c4 100644
--- a/src/com/mirantis/mk/KaasUtils.groovy
+++ b/src/com/mirantis/mk/KaasUtils.groovy
@@ -105,6 +105,8 @@
def enableArtifactsBuild = true
def openstackIMC = env.OPENSTACK_CLOUD_LOCATION ? env.OPENSTACK_CLOUD_LOCATION : 'us'
def enableVsphereUbuntu = env.VSPHERE_DEPLOY_UBUNTU ? env.VSPHERE_DEPLOY_UBUNTU.toBoolean() : false
+ def childOsBootFromVolume = env.OPENSTACK_BOOT_FROM_VOLUME ? env.OPENSTACK_BOOT_FROM_VOLUME.toBoolean() : false
+ def bootstrapV2Scenario = env.BOOTSTRAP_V2_ENABLED ? env.BOOTSTRAP_V2_ENABLED.toBoolean() : false
def commitMsg = env.GERRIT_CHANGE_COMMIT_MESSAGE ? new String(env.GERRIT_CHANGE_COMMIT_MESSAGE.decodeBase64()) : ''
if (commitMsg ==~ /(?s).*\[mgmt-proxy\].*/ || env.GERRIT_EVENT_COMMENT_TEXT ==~ /(?s).*mgmt-proxy.*/) {
@@ -275,6 +277,11 @@
common.errorMsg('artifacts build will be aborted, VF -1 will be set')
}
+ if (commitMsg ==~ /(?s).*\[child-os-boot-from-volume\].*/ || env.GERRIT_EVENT_COMMENT_TEXT ==~ /(?s).*child-os-boot-from-volume\.*/) {
+ childOsBootFromVolume = true
+ common.warningMsg('OS will be booted from Ceph volumes')
+ }
+
// TODO (vnaumov) remove below condition after moving all releases to UCP
def ucpChildMatches = (commitMsg =~ /(\[child-ucp\s*ucp-.*?\])/)
if (ucpChildMatches.size() > 0) {
@@ -351,6 +358,10 @@
// calculate weight of current demo run to manage lockable resources
def demoWeight = (deployChild) ? 2 : 1 // management = 1, child = 1
+ if (commitMsg ==~ /(?s).*\[bootstrapv2-scenario\].*/ || env.GERRIT_EVENT_COMMENT_TEXT ==~ /(?s).*bootstrapv2-scenario\.*/) {
+ bootstrapV2Scenario = true
+ }
+
common.infoMsg("""
OpenStack Cloud location: ${openstackIMC}
CDN deployment configuration: ${cdnConfig}
@@ -392,9 +403,11 @@
BM provider deployment scheduled: ${enableBMDemo}
Ubuntu on vSphere scheduled: ${enableVsphereUbuntu}
Artifacts build scheduled: ${enableArtifactsBuild}
+ Boot OS child from Ceph volumes: ${childOsBootFromVolume}
Multiregional configuration: ${multiregionalMappings}
Service binaries fetching scheduled: ${fetchServiceBinaries}
Current weight of the demo run: ${demoWeight} (Used to manage lockable resources)
+ Bootstrap v2 scenario enabled: ${bootstrapV2Scenario}
Triggers: https://gerrit.mcp.mirantis.com/plugins/gitiles/kaas/core/+/refs/heads/master/hack/ci-gerrit-keywords.md""")
return [
osCloudLocation : openstackIMC,
@@ -439,8 +452,10 @@
osDemoEnabled : enableOSDemo,
vsphereUbuntuEnabled : enableVsphereUbuntu,
artifactsBuildEnabled : enableArtifactsBuild,
+ childOsBootFromVolume : childOsBootFromVolume,
multiregionalConfiguration : multiregionalMappings,
- demoWeight : demoWeight]
+ demoWeight : demoWeight,
+ bootstrapV2Scenario : bootstrapV2Scenario]
}
/**