commit 812fe1f252f4c97aa04f5ec35602d8ba4df2aadd
author Aleksandr Lovtsov <alovtsov@mirantis.com> Fri Sep 02 10:53:01 2022 +0000
committer Gerrit Code Review <gerrit@172.18.228.131> Fri Sep 02 10:53:01 2022 +0000
tree 104063a6b7901a4bbf7574d9b3b35177b85e1898
parent 88d1c3d945c965b25146e148e1f05e026eb8c1ff
parent 1c78e457749864bb7850f2e02f7c8a0552249a1c

Merge "[kaas] Extend parseKaaSComponentCIParameters to return FFlags for stable release too"

src/com/mirantis/mk/KaasUtils.groovy

diff --git a/src/com/mirantis/mk/KaasUtils.groovy b/src/com/mirantis/mk/KaasUtils.groovy
index f4ab9cf..967eaa1 100644
--- a/src/com/mirantis/mk/KaasUtils.groovy
+++ b/src/com/mirantis/mk/KaasUtils.groovy
@@ -574,6 +574,7 @@
  * @param configurationFile    (str) path to configuration file in yaml format
  *
  * @return                     (map)[     siTestsFeatureFlags (string) dedicated feature flags that will be used in SI tests,
+ *                                        siTestsFeatureFlagsStable (string) dedicated feature flags that will be used in SI tests for deploying stable release
  *                                  ]
  */
 def parseKaaSComponentCIParameters(configurationFile){
@@ -581,9 +582,11 @@
    def ciConfig = readYaml file: configurationFile
    def ciSpec = [
    siTestsFeatureFlags: env.SI_TESTS_FEATURE_FLAGS ?: '',
+   siTestsFeatureFlagsStable: env.SI_TESTS_FEATURE_FLAGS_STABLE ?: '',
    ]
 
-   if (ciConfig.containsKey('si-tests-feature-flags')) {
+   // If exists and not empty
+   if (ciConfig.getOrDefault('si-tests-feature-flags', [])) {
        common.infoMsg("""SI tests feature flags customization detected,
            results will be merged with existing flags: [${ciSpec['siTestsFeatureFlags']}] identification...""")
 
@@ -593,9 +596,20 @@
        ciSpec['siTestsFeatureFlags'] = ffMeta.unique().join(',')
        common.infoMsg("SI tests custom feature flags: ${ciSpec['siTestsFeatureFlags']}")
    }
+   if (ciConfig.getOrDefault('si-tests-feature-flags-stable', [])) {
+       common.infoMsg("""SI tests feature flags for stable release customization detected,
+           results will be merged with existing flags: [${ciSpec['siTestsFeatureFlagsStable']}] identification...""")
+
+       def ffMeta = ciSpec['siTestsFeatureFlagsStable'].tokenize(',').collect { it.trim() }
+       ffMeta.addAll(ciConfig['si-tests-feature-flags-stable'])
+
+       ciSpec['siTestsFeatureFlagsStable'] = ffMeta.unique().join(',')
+       common.infoMsg("SI tests custom feature flags for stable release: ${ciSpec['siTestsFeatureFlagsStable']}")
+   }
 
    common.infoMsg("""Additional ci configuration parsed successfully:
-       siTestsFeatureFlags: ${ciSpec['siTestsFeatureFlags']}""")
+       siTestsFeatureFlags: ${ciSpec['siTestsFeatureFlags']}
+       siTestsFeatureFlagsStable: ${ciSpec['siTestsFeatureFlagsStable']}""")
    return ciSpec
 }