Merge "[CI] add netmap for byo vsphere"
diff --git a/src/com/mirantis/mk/KaasUtils.groovy b/src/com/mirantis/mk/KaasUtils.groovy
index 3272073..a7521c7 100644
--- a/src/com/mirantis/mk/KaasUtils.groovy
+++ b/src/com/mirantis/mk/KaasUtils.groovy
@@ -371,6 +371,12 @@
enableBMDemo = false
}
+ // Projects may or may not have BM Core demo enabled by default
+ if (commitMsg ==~ /(?s).*\[disable-bm-core-demo\].*/ || env.GERRIT_EVENT_COMMENT_TEXT ==~ /(?s).*disable-bm-core-demo\.*/) {
+ enablebmCoreDemo = false
+ common.errorMsg('BM Core demo deployment will be aborted, VF -1 will be set')
+ }
+
if (commitMsg ==~ /(?s).*\[disable-bm-core-cleanup\].*/ || env.GERRIT_EVENT_COMMENT_TEXT ==~ /(?s).*disable-bm-core-cleanup\\.*/) {
bmCoreCleanup = false
}
@@ -975,6 +981,9 @@
if (triggers.vsphereDemoEnabled) {
platforms.add('vsphere')
}
+ if (triggers.bmCoreDemoEnabled) {
+ platforms.add('bm')
+ }
}
def jobs = [:]
@@ -1545,6 +1554,7 @@
'DESTINATION_REGISTRY_TYPE': '-dst-repo-type',
'SIGNED_IMAGES_PATH': '-signed-images-path',
'DOCKER_CLEAN': '-cleanup',
+ 'DOCKER_OLDER_THAN_DAYS': '-older-than-days',
'DOCKER_REPO_PREFIX': '-docker-repo-prefix',
'DOCKER_TAG': '-docker-tag',
'FORCE': '-force',