commit d11f7923ec5345611e5eb0543a2caa6264e6c755
author Denis Egorenko <degorenko@mirantis.com> Thu Oct 18 12:59:54 2018 +0000
committer Denis Egorenko <degorenko@mirantis.com> Thu Oct 18 17:02:23 2018 +0400
tree 1e1d3ac313e72ff91aa5ede2f610cd11fd07e45c
parent d67a6d2a562df88a8518629c978bd35488c59772

Revert "Add ability to run cookiecutter tests against packaging/sources/reclass repo"

This reverts commit 47169278cb4fe7d9541828cc49d9dc63d953f644.

Change-Id: I48c86cebab813c736ba8cb821faded29e1d2d059

test-cookiecutter-reclass.groovy

diff --git a/test-cookiecutter-reclass.groovy b/test-cookiecutter-reclass.groovy
index 8ca2573..0bab394 100644
--- a/test-cookiecutter-reclass.groovy
+++ b/test-cookiecutter-reclass.groovy
@@ -55,7 +55,6 @@
 
 // version of debRepos, aka formulas|reclass|ubuntu
 testDistribRevision = env.DISTRIB_REVISION ?: 'nightly'
-
 // Name of sub-test chunk job
 chunkJobName = "test-mk-cookiecutter-templates-chunk"
 testModelBuildsData = [:]
@@ -70,7 +69,7 @@
     }
 }
 
-def testModel(modelFile, reclassArtifactName, artifactCopyPath, useExtraRepos = false) {
+def testModel(modelFile, reclassArtifactName, artifactCopyPath) {
     // modelFile - `modelfiname` from model/modelfiname/modelfiname.yaml
     //* Grub all models and send it to check in paralell - by one in thread.
     def _uuid = "${env.JOB_NAME.toLowerCase()}_${env.BUILD_TAG.toLowerCase()}_${modelFile.toLowerCase()}_" + UUID.randomUUID().toString().take(8)
@@ -81,8 +80,6 @@
   testReclassEnv: "model/${modelFile}/"
   modelFile: "contexts/${modelFile}.yml"
   DISTRIB_REVISION: "${testDistribRevision}"
-  useExtraRepos: ${useExtraRepos}
-  ${extraVarsYAML}
   """
     def chunkJob = build job: chunkJobName, parameters: [
         [$class: 'TextParameterValue', name: 'EXTRA_VARIABLES_YAML',
@@ -94,7 +91,7 @@
                                     'buildId'  : "${chunkJob.number}"])
 }
 
-def StepTestModel(basename, reclassArtifactName, artifactCopyPath, useExtraRepos = false) {
+def StepTestModel(basename, reclassArtifactName, artifactCopyPath) {
     // We need to wrap what we return in a Groovy closure, or else it's invoked
     // when this method is called, not when we pass it to parallel.
     // To do this, you need to wrap the code below in { }, and either return
@@ -102,7 +99,7 @@
     // return node object
     return {
         node(slaveNode) {
-            testModel(basename, reclassArtifactName, artifactCopyPath, useExtraRepos)
+            testModel(basename, reclassArtifactName, artifactCopyPath)
         }
     }
 }
@@ -362,7 +359,7 @@
                 common.infoMsg("Found: ${contextFileListPatched.size()} patched contexts to test.")
                 for (String context : contextFileListPatched) {
                     def basename = common.GetBaseName(context, '.yml')
-                    stepsForParallel.put("ContextPatchedTest:${basename}", StepTestModel(basename, patchedReclassArtifactName, reclassInfoPatchedPath, true))
+                    stepsForParallel.put("ContextPatchedTest:${basename}", StepTestModel(basename, patchedReclassArtifactName, reclassInfoPatchedPath))
                 }
                 parallel stepsForParallel
                 common.infoMsg('All TestContexts tests done')