commit 635affb425a7d1333a5213808bc58853d12f7b75
author azvyagintsev <azvyagintsev@mirantis.com> Thu Sep 13 13:02:54 2018 +0300
committer azvyagintsev <azvyagintsev@mirantis.com> Thu Sep 13 13:03:15 2018 +0300
tree a679d56aba695a6c3283aa308436795b95e490d5
parent 467d218b4e6d79bd01a41c4142cf7b69d543d989

Fix setupAndTestNode installALl Formulas Logic

Change-Id: I1d923738517a65a904490434411c71d5c54bc12f

src/com/mirantis/mk/SaltModelTesting.groovy

diff --git a/src/com/mirantis/mk/SaltModelTesting.groovy b/src/com/mirantis/mk/SaltModelTesting.groovy
index 6d7b9ad..381247a 100644
--- a/src/com/mirantis/mk/SaltModelTesting.groovy
+++ b/src/com/mirantis/mk/SaltModelTesting.groovy
@@ -31,9 +31,11 @@
     def img = docker.image("mirantis/salt:saltstack-ubuntu-xenial-salt-2017.7")
     img.pull()
 
-    if (!extraFormulas.contains('*') && formulasSource == 'pkg') {
-        common.warningMsg("You have passed deprecated variable:extraFormulas=${extraFormulas}. " +
-            "\n It would be ignored, and all formulas would be installed anyway")
+    if (formulasSource == 'pkg') {
+        if (extraFormulas) {
+            common.warningMsg("You have passed deprecated variable:extraFormulas=${extraFormulas}. " +
+                "\n It would be ignored, and all formulas would be installed anyway")
+        }
     }
     if (!dockerContainerName) {
         dockerContainerName = 'setupAndTestNode' + UUID.randomUUID().toString()
@@ -44,7 +46,7 @@
     }
     try {
         img.inside("-u root:root --hostname=${masterName} --ulimit nofile=4096:8192 ${dockerMaxCpusOpt} --name=${dockerContainerName}") {
-            withEnv(["FORMULAS_SOURCE=${formulasSource}", "EXTRA_FORMULAS=${extraFormulas}",
+            withEnv(["FORMULAS_SOURCE=${formulasSource}", "EXTRA_FORMULAS=${extraFormulas}", "EXTRA_FORMULAS_PKG_ALL=true",
                      "DISTRIB_REVISION=${formulasRevision}",
                      "DEBUG=1", "MASTER_HOSTNAME=${masterName}",
                      "CLUSTER_NAME=${clusterName}", "MINION_ID=${masterName}",