test-system-reclass-pipeline: don't pass DISTRIB_REVISION
* test-mk-cookiecutter-template: Those option render's automatically in job,
according branches
* test-salt-model-*: should be used from default_job
definition
Change-Id: Ibb8bfa1d8ac05289c180b32daa1754627fc2da14
diff --git a/test-system-reclass-pipeline.groovy b/test-system-reclass-pipeline.groovy
index d6e38e4..47dde97 100644
--- a/test-system-reclass-pipeline.groovy
+++ b/test-system-reclass-pipeline.groovy
@@ -12,7 +12,6 @@
def checkouted = false
def merged = false
def systemRefspec = "HEAD"
-def formulasRevision = 'testing'
timeout(time: 12, unit: 'HOURS') {
node(slaveNode) {
@@ -60,8 +59,7 @@
[$class: 'StringParameterValue', name: 'DEFAULT_GIT_URL', value: clusterGitUrl],
[$class: 'StringParameterValue', name: 'DEFAULT_GIT_REF', value: "HEAD"],
[$class: 'StringParameterValue', name: 'SYSTEM_GIT_URL', value: defaultGitUrl],
- [$class: 'StringParameterValue', name: 'SYSTEM_GIT_REF', value: systemRefspec],
- [$class: 'StringParameterValue', name: 'FORMULAS_REVISION', value: formulasRevision],
+ [$class: 'StringParameterValue', name: 'SYSTEM_GIT_REF', value: systemRefspec]
]
}
}
@@ -71,9 +69,7 @@
branches["cookiecutter"] = {
build job: "test-mk-cookiecutter-templates", parameters: [
[$class: 'StringParameterValue', name: 'RECLASS_SYSTEM_URL', value: defaultGitUrl],
- [$class: 'StringParameterValue', name: 'RECLASS_SYSTEM_GIT_REF', value: systemRefspec],
- [$class: 'StringParameterValue', name: 'DISTRIB_REVISION', value: formulasRevision]
-
+ [$class: 'StringParameterValue', name: 'RECLASS_SYSTEM_GIT_REF', value: systemRefspec]
]
}
parallel branches