Add possibility to set formula source
Change-Id: Icec589d97607a44835503444a5ddd83da4e8682e
diff --git a/test-salt-model-node.groovy b/test-salt-model-node.groovy
index 53f5e75..117971b 100644
--- a/test-salt-model-node.groovy
+++ b/test-salt-model-node.groovy
@@ -8,6 +8,7 @@
* NODE_TARGET
* SYSTEM_GIT_URL
* SYSTEM_GIT_REF
+ * FORMULAS_SOURCE
*/
def common = new com.mirantis.mk.Common()
@@ -51,7 +52,7 @@
stage("test node") {
if (checkouted) {
def workspace = common.getWorkspace()
- saltModelTesting.setupAndTestNode(NODE_TARGET, EXTRA_FORMULAS, workspace)
+ saltModelTesting.setupAndTestNode(NODE_TARGET, EXTRA_FORMULAS, workspace, FORMULAS_SOURCE)
}
}
} catch (Throwable e) {
diff --git a/test-salt-models-pipeline.groovy b/test-salt-models-pipeline.groovy
index f2a38f9..b2123c5 100644
--- a/test-salt-models-pipeline.groovy
+++ b/test-salt-models-pipeline.groovy
@@ -21,6 +21,13 @@
gerritRef = null
}
+def formulasSource
+try {
+ formulasSource = FORMULAS_SOURCE
+} catch (MissingPropertyException e) {
+ formulasSource = "pkg"
+}
+
def defaultGitRef, defaultGitUrl
try {
defaultGitRef = DEFAULT_GIT_REF
@@ -87,6 +94,7 @@
[$class: 'StringParameterValue', name: 'DEFAULT_GIT_REF', value: defaultGitRef],
[$class: 'StringParameterValue', name: 'NODE_TARGET', value: testTarget],
[$class: 'StringParameterValue', name: 'EXTRA_FORMULAS', value: EXTRA_FORMULAS],
+ [$class: 'StringParameterValue', name: 'FORMULAS_SOURCE', value: formulasSource],
[$class: 'StringParameterValue', name: 'CREDENTIALS_ID', value: CREDENTIALS_ID],
[$class: 'StringParameterValue', name: 'SYSTEM_GIT_URL', value: SYSTEM_GIT_URL],
[$class: 'StringParameterValue', name: 'SYSTEM_GIT_REF', value: SYSTEM_GIT_REF]