commit 56974ff7a6c8787a6622d9dddffda409a7740f04
author Ivan Udovichenko <iudovichenko@mirantis.com> Wed Oct 06 09:46:06 2021 +0000
committer Gerrit Code Review <gerrit@172.18.228.131> Wed Oct 06 09:46:06 2021 +0000
tree 30b6cd138c29280f5f3a8f98f59f365dd94f6a45
parent af150d3b0cf94fdb41f6fe7cab58a3cc9ba280a3
parent 681f35fcd6e2db429c8dc8cbcb3faec395bdccd7

Merge "[DockerImageScanner] Check if request is empty"

src/com/mirantis/mk/KaasUtils.groovy

diff --git a/src/com/mirantis/mk/KaasUtils.groovy b/src/com/mirantis/mk/KaasUtils.groovy
index 8dfb102..0a9515e 100644
--- a/src/com/mirantis/mk/KaasUtils.groovy
+++ b/src/com/mirantis/mk/KaasUtils.groovy
@@ -79,6 +79,7 @@
     // optional demo deployment customization
     def awsOnDemandDemo = env.ALLOW_AWS_ON_DEMAND ? env.ALLOW_AWS_ON_DEMAND.toBoolean() : false
     def equinixOnDemandDemo = env.ALLOW_EQUINIX_ON_DEMAND ? env.ALLOW_EQUINIX_ON_DEMAND.toBoolean() : false
+    def equinixPrivateDemo = env.EQUINIX_PRIVATE_DEMO ? env.EQUINIX_PRIVATE_DEMO.toBoolean() : false
     def equinixOnAwsDemo = env.EQUINIX_ON_AWS_DEMO ? env.EQUINIX_ON_AWS_DEMO.toBoolean() : false
     def azureOnAwsDemo = env.AZURE_ON_AWS_DEMO ? env.AZURE_ON_AWS_DEMO.toBoolean() : false
     def azureOnDemandDemo = env.ALLOW_AZURE_ON_DEMAND ? env.ALLOW_AZURE_ON_DEMAND.toBoolean() : false
@@ -173,6 +174,10 @@
     if (commitMsg ==~ /(?s).*\[equinix-demo\].*/ || env.GERRIT_EVENT_COMMENT_TEXT ==~ /(?s).*equinix-demo\.*/) {
         equinixOnDemandDemo = true
     }
+    if (commitMsg ==~ /(?s).*\[equinix-private-demo\].*/ || env.GERRIT_EVENT_COMMENT_TEXT ==~ /(?s).*equinix-private-demo\.*/) {
+        equinixOnDemandDemo = true
+        equinixPrivateDemo = true
+    }
     if (commitMsg ==~ /(?s).*\[azure-demo\].*/ || env.GERRIT_EVENT_COMMENT_TEXT ==~ /(?s).*azure-demo\.*/) {
         azureOnDemandDemo = true
     }
@@ -268,6 +273,7 @@
         Mgmt UI e2e testing scheduled: ${runUie2e}
         AWS provider deployment scheduled: ${awsOnDemandDemo}
         Equinix provider deployment scheduled: ${equinixOnDemandDemo}
+        Equinix provider private MCC deployment: ${equinixPrivateDemo}
         Equinix@AWS child cluster deployment scheduled: ${equinixOnAwsDemo}
         Azure provider deployment scheduled: ${azureOnDemandDemo}
         Azure@AWS child cluster deployment scheduled: ${azureOnAwsDemo}
@@ -297,6 +303,7 @@
         fetchServiceBinariesEnabled      : fetchServiceBinaries,
         awsOnDemandDemoEnabled           : awsOnDemandDemo,
         equinixOnDemandDemoEnabled       : equinixOnDemandDemo,
+        equinixPrivateDemoEnabled        : equinixPrivateDemo,
         equinixOnAwsDemoEnabled          : equinixOnAwsDemo,
         azureOnDemandDemoEnabled         : azureOnDemandDemo,
         azureOnAwsDemoEnabled            : azureOnAwsDemo,
@@ -569,6 +576,7 @@
         booleanParam(name: 'RUN_CHILD_CFM', value: triggers.runChildConformanceEnabled),
         booleanParam(name: 'ALLOW_AWS_ON_DEMAND', value: triggers.awsOnDemandDemoEnabled),
         booleanParam(name: 'ALLOW_EQUINIX_ON_DEMAND', value: triggers.equinixOnDemandDemoEnabled),
+        booleanParam(name: 'EQUINIX_PRIVATE_DEMO', value: triggers.equinixPrivateDemoEnabled),
         booleanParam(name: 'EQUINIX_ON_AWS_DEMO', value: triggers.equinixOnAwsDemoEnabled),
         booleanParam(name: 'ALLOW_AZURE_ON_DEMAND', value: triggers.azureOnDemandDemoEnabled),
         booleanParam(name: 'AZURE_ON_AWS_DEMO', value: triggers.azureOnAwsDemoEnabled),