Define dockerOptsFinal in correct place for SetupDockerAndTest
Change-Id: I5b6b98fe1fc8e685ff1a954f9488d07d9f427932
diff --git a/src/com/mirantis/mk/SaltModelTesting.groovy b/src/com/mirantis/mk/SaltModelTesting.groovy
index a4c90f1..e7a139e 100644
--- a/src/com/mirantis/mk/SaltModelTesting.groovy
+++ b/src/com/mirantis/mk/SaltModelTesting.groovy
@@ -43,6 +43,7 @@
"--name=${dockerContainerName}",
"--cpus=${dockerMaxCpus}"
]
+ def dockerOptsFinal = (dockerBaseOpts + dockerExtraOpts).join(' ')
if (baseRepoPreConfig) {
// extra repo on mirror.mirantis.net, which is not supported before 2018.11.0 release
def extraRepoSource = "deb [arch=amd64] http://mirror.mirantis.com/${distribRevision}/extra/xenial xenial main"
@@ -60,7 +61,6 @@
}
}
- def dockerOptsFinal = (dockerBaseOpts + dockerExtraOpts).join(' ')
def defaultExtraReposYaml = """
---
aprConfD: |-