Allign RECLASS_VERSION|FORMULAS_REVISION=>DISTRIB_REVISION
* env. variable - DISTRIB_REVISION
* groovyCode variable - distribRevision
Related-Bug: PROD-22476 (PROD:22476)
Change-Id: I4b3b342accdc2e1a21d66f9fab6cc2e47ad08010
diff --git a/test-cookiecutter-reclass.groovy b/test-cookiecutter-reclass.groovy
index 6f73570..0a20ece 100644
--- a/test-cookiecutter-reclass.groovy
+++ b/test-cookiecutter-reclass.groovy
@@ -53,12 +53,8 @@
gerritDataRS['gerritRefSpec'] = env.RECLASS_SYSTEM_GIT_REF ?: null
gerritDataRS['gerritProject'] = 'salt-models/reclass-system'
-// version of debRepos, aka formulas\reclass
+// version of debRepos, aka formulas\reclass\ubuntu
testDistribRevision = env.DISTRIB_REVISION ?: 'nightly'
-reclassVersion = 'v1.5.4'
-if (env.RECLASS_VERSION) {
- reclassVersion = env.RECLASS_VERSION
-}
// Name of sub-test chunk job
chunkJobName = "test-mk-cookiecutter-templates-chunk"
testModelBuildsData = [:]
@@ -157,7 +153,6 @@
testReclassEnv: "model/${modelFile}/"
modelFile: "contexts/${modelFile}.yml"
DISTRIB_REVISION: "${testDistribRevision}"
- reclassVersion: "${reclassVersion}"
"""
def chunkJob = build job: chunkJobName, parameters: [
[$class: 'TextParameterValue', name: 'EXTRA_VARIABLES_YAML',