commit 382144f6ed2c50bcc6f0919f43fca7e02d4be0f5
author Vladislav Naumov <vnaumov@mirantis.com> Fri Oct 22 15:52:45 2021 +0000
committer Vladislav Naumov <vnaumov@mirantis.com> Fri Oct 22 15:55:26 2021 +0000
tree 0d83c2467abb7fab6d960da799f9e69248fd3b54
parent 2e204be9e4e88e4f3985f128d44503c3fd28a249

Revert "Add parameters for Os-ui"

This reverts commit a588149aaf4015e3ff20579cbc3c11b342bcf9bf.

Reason for revert: < its not needed>

Change-Id: I12941b744fb19bb0b971e3fe95b89450ad9ea8c4

src/com/mirantis/mk/KaasUtils.groovy

diff --git a/src/com/mirantis/mk/KaasUtils.groovy b/src/com/mirantis/mk/KaasUtils.groovy
index 2f78773..3f1b1c6 100644
--- a/src/com/mirantis/mk/KaasUtils.groovy
+++ b/src/com/mirantis/mk/KaasUtils.groovy
@@ -84,7 +84,6 @@
     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
-    def osUiOnDemandDemo = env.ALLOW_OS_UI_ON_DEMAND ? env.ALLOW_OS_UI_ON_DEMAND.toBoolean() : false
     def enableVsphereDemo = true
     def enableOSDemo = true
     def enableBMDemo = true
@@ -187,9 +186,6 @@
     if (commitMsg ==~ /(?s).*\[azure-demo\].*/ || env.GERRIT_EVENT_COMMENT_TEXT ==~ /(?s).*azure-demo\.*/) {
         azureOnDemandDemo = true
     }
-    if (commitMsg ==~ /(?s).*\[os-ui-demo\].*/ || env.GERRIT_EVENT_COMMENT_TEXT ==~ /(?s).*os-ui-demo\.*/) {
-        osUiOnDemandDemo = true
-    }
     if (commitMsg ==~ /(?s).*\[disable-os-demo\].*/ || env.GERRIT_EVENT_COMMENT_TEXT ==~ /(?s).*disable-os-demo\.*/) {
         enableOSDemo = false
         common.errorMsg('Openstack demo deployment will be aborted, VF -1 will be set')
@@ -320,7 +316,6 @@
         azureOnAwsDemoEnabled            : azureOnAwsDemo,
         vsphereDemoEnabled               : enableVsphereDemo,
         vsphereOnDemandDemoEnabled       : enableVsphereDemo, // TODO: remove after MCC 2.7 is out
-        osUiOnDemandDemoEnabled          : osUiOnDemandDemo,
         bmDemoEnabled                    : enableBMDemo,
         osDemoEnabled                    : enableOSDemo,
         multiregionalConfiguration       : multiregionalMappings,
@@ -555,9 +550,6 @@
         if (triggers.equinixMetalV2OnDemandDemoEnabled) {
             platforms.add('equinixmetalv2')
         }
-        if (triggers.osUiOnDemandDemoEnabled){
-            platforms.add('openstack-ui')
-        }
         if (triggers.azureOnDemandDemoEnabled) {
             platforms.add('azure')
         }
@@ -599,7 +591,6 @@
         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),
-        booleanParam(name: 'ALLOW_OS_UI_ON_DEMAND', value: triggers.osUiOnDemandDemoEnabled)
     ]
 
     // customize multiregional demo