commit c0a492a1b2f122b5b54a9d2d30fdac278222a86f
author Denis Egorenko <degorenko@mirantis.com> Thu Oct 18 16:14:05 2018 +0400
committer Denis Egorenko <degorenko@mirantis.com> Thu Oct 18 16:14:05 2018 +0400
tree 04cb99ff19a3635e03cad7cf2f4099fcf01bc2ba
parent fa2c6756a48cd9c1d6d5cafca77130a12c2f3e2a

Fix typo for SetupDockerAndTest function

Change-Id: If55bbb2ee7a59d5e88f3c728ae6619705c9d16a6

src/com/mirantis/mk/SaltModelTesting.groovy

diff --git a/src/com/mirantis/mk/SaltModelTesting.groovy b/src/com/mirantis/mk/SaltModelTesting.groovy
index 0016d70..3e551f6 100644
--- a/src/com/mirantis/mk/SaltModelTesting.groovy
+++ b/src/com/mirantis/mk/SaltModelTesting.groovy
@@ -92,7 +92,7 @@
 """
         def extraRepoMergeStrategy = config.get('extraRepoMergeStrategy', 'merge')
         def extraReposYaml = null
-        if (defaultMergeStrategy == 'merge') {
+        if (extraRepoMergeStrategy == 'merge') {
             def extraReposYamlConfig = config.get('extraReposYaml', '')
             def extraRepos = readYaml text: extraReposYamlConfig
             def defaultRepos = readYaml text: defaultExtraReposYaml