Add WA for formulaList in 2018.8.1
Related-Bug: PROD-22920 (PROD:22920)
Change-Id: I988bc21756b469a370454db3ba7c7d1bbdb846bc
diff --git a/test-cookiecutter-reclass.groovy b/test-cookiecutter-reclass.groovy
index d66017c..9994323 100644
--- a/test-cookiecutter-reclass.groovy
+++ b/test-cookiecutter-reclass.groovy
@@ -52,7 +52,7 @@
// Name of sub-test chunk job
chunkJobName = "test-mk-cookiecutter-templates-chunk"
testModelBuildsData = [:]
-
+extraFormulasList = env.EXTRA_FORMULAS.tokenize() ?: ['linux', 'openssh']
def generateSaltMaster(modEnv, clusterDomain, clusterName) {
def nodeFile = "${modEnv}/nodes/cfg01.${clusterDomain}.yml"
@@ -152,7 +152,7 @@
testReclassEnv: "model/${modelFile}/"
modelFile: "contexts/${modelFile}.yml"
DISTRIB_REVISION: "${testDistribRevision}"
- EXTRA_FORMULAS: "${env.EXTRA_FORMULAS}"
+ EXTRA_FORMULAS: "${extraFormulasList.join(' ')}"
reclassVersion: "${reclassVersion}"
"""
def chunkJob = build job: chunkJobName, parameters: [
@@ -224,11 +224,19 @@
// based on magic logic
def message = ''
if (env.GERRIT_PROJECT) {
+ // TODO are we going to have such branches?
if (!['nightly', 'testing', 'stable', 'proposed', 'master'].contains(env.GERRIT_BRANCH)) {
gerritDataCC['gerritBranch'] = env.GERRIT_BRANCH
gerritDataRS['gerritBranch'] = env.GERRIT_BRANCH
// 'binary' branch logic w\o 'release/' prefix
testDistribRevision = env.GERRIT_BRANCH.split('/')[-1]
+ /// FIXME: ugly hack, for versioning tests.
+ // Leave it in this place - to don't fail after release.
+ if (testDistribRevision == '2018.8.1') {
+ if (extraFormulasList.remove('openscap')) {
+ common.infoMsg('Removing openscap from tests extraFormulasList !')
+ }
+ }
// Check if we are going to test bleeding-edge release, which doesn't have binary release yet
if (!common.checkRemoteBinary([apt_mk_version: testDistribRevision]).linux_system_repo_url) {
common.errorMsg("Binary release: ${testDistribRevision} not exist. Fallback to 'proposed'! ")