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 29d9289..967eaa1 100644
--- a/src/com/mirantis/mk/KaasUtils.groovy
+++ b/src/com/mirantis/mk/KaasUtils.groovy
@@ -1200,15 +1200,16 @@
         'SYNC_PATTERN': '-sync-pattern'
     ]
     def cmdParams = ''
+    def isCheckClean = false
     for (e in envToParam) {
         if (env[e.key] == null) {
             continue
         }
         if (e.key == 'CHECK_REPOS' || e.key == 'DOCKER_CLEAN') {
-            if (env[e.key].toBoolean()) {
+            // Avoid CHECK_REPOS=true and DOCKER_CLEAN=true
+            if (env[e.key].toBoolean() && !isCheckClean) {
                 cmdParams += e.value + ' '
-            } else {
-                cmdParams += '-replicate '
+                isCheckClean = true
             }
         } else if (e.key == 'FORCE') {
             if (env[e.key].toBoolean()) {
@@ -1218,5 +1219,9 @@
             cmdParams += "${e.value} '${env[e.key]}' "
         }
     }
+    // No any check or clean was specified - take a default action
+    if (!isCheckClean) {
+        cmdParams += '-replicate'
+    }
     return cmdParams
 }