commit 19a793d231b17235a4dc9d6b557f4d559527c28c
author Denis Egorenko <degorenko@mirantis.com> Mon Nov 18 20:50:59 2019 +0400
committer Denis Egorenko <degorenko@mirantis.com> Tue Nov 19 08:46:28 2019 +0000
tree 35d36f7d4a68fb8d8ff0bbbcbf6276c789c9476f
parent 52d48dfe8bac6b1ef150f0691c527463090d221f

Set version of updates repo if needed

Change to proposed if tests for release/proposed

Change-Id: Id933aedd8c5b51dccee510d85b19d523af7f313b
Related-Prod: PROD-34057

generate-cookiecutter-products.groovy

diff --git a/generate-cookiecutter-products.groovy b/generate-cookiecutter-products.groovy
index d8bfe3a..806534b 100644
--- a/generate-cookiecutter-products.groovy
+++ b/generate-cookiecutter-products.groovy
@@ -258,6 +258,9 @@
                             'dockerExtraOpts'    : ['--memory=3g'],
                             'updateSaltFormulas' : updateSaltFormulasDuringTest
                         ]
+                        if (gitGuessedVersion == 'release/proposed/2019.2.0') {
+                            config['updateSaltFormulasRev'] = 'proposed'
+                        }
                         testResult = saltModelTesting.testNode(config)
                         common.infoMsg("Test finished: SUCCESS")
                     } catch (Exception ex) {

test-cookiecutter-reclass-chunk.groovy

diff --git a/test-cookiecutter-reclass-chunk.groovy b/test-cookiecutter-reclass-chunk.groovy
index de30e65..ed65dd6 100644
--- a/test-cookiecutter-reclass-chunk.groovy
+++ b/test-cookiecutter-reclass-chunk.groovy
@@ -37,6 +37,9 @@
                 if (extraVars.DISTRIB_REVISION == 'nightly') {
                     config['nodegenerator'] = true
                 }
+                if (extraVars.updatesVersion) {
+                    config['updateSaltFormulasRev'] = extraVars.updatesVersion
+                }
                 if (extraVars.useExtraRepos) {
                     config['extraRepos'] = extraVars.extraRepos ? extraVars.extraRepos : [:]
                     config['extraRepoMergeStrategy'] = extraVars.extraRepoMergeStrategy ? extraVars.extraRepoMergeStrategy : ''

test-cookiecutter-reclass.groovy

diff --git a/test-cookiecutter-reclass.groovy b/test-cookiecutter-reclass.groovy
index 9c34f58..95e5240 100644
--- a/test-cookiecutter-reclass.groovy
+++ b/test-cookiecutter-reclass.groovy
@@ -59,6 +59,7 @@
 
 // version of debRepos, aka formulas|reclass|ubuntu
 testDistribRevision = env.DISTRIB_REVISION ?: 'nightly'
+updatesVersion = null
 
 // Name of sub-test chunk job
 chunkJobName = "test-mk-cookiecutter-templates-chunk"
@@ -85,6 +86,7 @@
         modelFile       : "contexts/${modelFile}.yml",
         DISTRIB_REVISION: testDistribRevision,
         useExtraRepos   : useExtraRepos,
+        updatesVersion  : updatesVersion,
     ]
     def _values_string = JsonOutput.toJson(_values << extraVars)
     def chunkJob = build job: chunkJobName, parameters: [
@@ -222,6 +224,9 @@
     // 'binary' branch logic w\o 'release/' prefix
     if (testDistribRevision.contains('/')) {
         testDistribRevision = testDistribRevision.split('/')[-1]
+        if (testDistribRevision.contains('proposed')) {
+            updatesVersion = 'proposed'
+        }
     }
     // Check if we are going to test bleeding-edge release, which doesn't have binary release yet
     // After 2018q4 releases, need to also check 'static' repo, for example ubuntu.