Drop EXTRA_FORMULAS logic
Related-Bug: PROD-23127 (PROD:23127)
Change-Id: I67df2026aa5439c7dd193b12a1c3f66d302b7a53
diff --git a/cloud-deploy-pipeline.groovy b/cloud-deploy-pipeline.groovy
index 25892df..ce35b51 100644
--- a/cloud-deploy-pipeline.groovy
+++ b/cloud-deploy-pipeline.groovy
@@ -199,7 +199,7 @@
envParams.put('cfg_bootstrap_extra_repo_params', BOOTSTRAP_EXTRA_REPO_PARAMS)
}
- // put extra salt-formulas
+ // put extra salt-formulas # FIXME: looks like some outdated logic. See #PROD-23127
if (common.validInputParam('EXTRA_FORMULAS')) {
common.infoMsg("Setting extra salt-formulas to ${EXTRA_FORMULAS}")
envParams.put('cfg_extra_formulas', EXTRA_FORMULAS)
diff --git a/generate-cookiecutter-products.groovy b/generate-cookiecutter-products.groovy
index 90640cb..e734734 100644
--- a/generate-cookiecutter-products.groovy
+++ b/generate-cookiecutter-products.groovy
@@ -13,20 +13,8 @@
saltModelTesting = new com.mirantis.mk.SaltModelTesting()
ssh = new com.mirantis.mk.Ssh()
-def reclassVersion = 'v1.5.4'
-if (common.validInputParam('RECLASS_VERSION')) {
- reclassVersion = RECLASS_VERSION
-}
-slaveNode = (env.SLAVE_NODE ?: 'python&&docker')
-
-// install extra formulas required only for rendering cfg01. All others - should be fetched automatically via
-// salt.master.env state, during salt-master bootstrap.
-// TODO: In the best - those data should fetched somewhere from CC, per env\context. Like option, process _enabled
-// options from CC contexts
-// currently, just mix them together in one set
-def testCfg01ExtraFormulas = 'glusterfs jenkins logrotate maas ntp rsyslog fluentd telegraf prometheus ' +
- 'grafana backupninja'
-
+reclassVersion = env.RECLASS_VERSION ?: 'v1.5.4'
+slaveNode = env.SLAVE_NODE ?: 'python&&docker'
timeout(time: 2, unit: 'HOURS') {
node(slaveNode) {
@@ -58,10 +46,6 @@
user = env.BUILD_USER_ID
}
- if (mcpVersion != '2018.4.0') {
- testCfg01ExtraFormulas += ' auditd'
- }
-
currentBuild.description = clusterName
print("Using context:\n" + COOKIECUTTER_TEMPLATE_CONTEXT)
@@ -196,7 +180,7 @@
testResult = saltModelTesting.setupAndTestNode(
"${saltMaster}.${clusterDomain}",
"",
- testCfg01ExtraFormulas,
+ "",
testEnv,
'pkg',
mcpVersion,
diff --git a/test-cookiecutter-reclass.groovy b/test-cookiecutter-reclass.groovy
index 865d7cd..b380bfd 100644
--- a/test-cookiecutter-reclass.groovy
+++ b/test-cookiecutter-reclass.groovy
@@ -52,11 +52,6 @@
// Name of sub-test chunk job
chunkJobName = "test-mk-cookiecutter-templates-chunk"
testModelBuildsData = [:]
-def extraFormulasList = ['linux', 'openssh']
-if (env.EXTRA_FORMULAS){
- extraFormulasList = env.EXTRA_FORMULAS.tokenize()
-}
-
def generateSaltMaster(modEnv, clusterDomain, clusterName) {
def nodeFile = "${modEnv}/nodes/cfg01.${clusterDomain}.yml"
@@ -156,7 +151,6 @@
testReclassEnv: "model/${modelFile}/"
modelFile: "contexts/${modelFile}.yml"
DISTRIB_REVISION: "${testDistribRevision}"
- EXTRA_FORMULAS: "${extraFormulasList.join(' ')}"
reclassVersion: "${reclassVersion}"
"""
def chunkJob = build job: chunkJobName, parameters: [
@@ -234,13 +228,6 @@
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'! ")
diff --git a/test-customers-salt-models.groovy b/test-customers-salt-models.groovy
index 3c0ccaf..4e84e22 100644
--- a/test-customers-salt-models.groovy
+++ b/test-customers-salt-models.groovy
@@ -22,7 +22,6 @@
// [$class: 'StringParameterValue', name: 'CLUSTER_NAME', value: modelName],
// [$class: 'StringParameterValue', name: 'NODE_TARGET', value: testTarget],
// [$class: 'StringParameterValue', name: 'FORMULAS_SOURCE', value: formulasSource]
- // [$class: 'StringParameterValue', name: 'EXTRA_FORMULAS', value: EXTRA_FORMULAS],
// [$class: 'StringParameterValue', name: 'FORMULAS_REVISION', value: FORMULAS_REVISION],
// [$class: 'StringParameterValue', name: 'CREDENTIALS_ID', value: CREDENTIALS_ID],
// [$class: 'StringParameterValue', name: 'SYSTEM_GIT_URL', value: SYSTEM_GIT_URL],
diff --git a/test-openstack-component-pipeline.groovy b/test-openstack-component-pipeline.groovy
index c660c28..010dbc0 100644
--- a/test-openstack-component-pipeline.groovy
+++ b/test-openstack-component-pipeline.groovy
@@ -4,7 +4,6 @@
* Flow parameters:
* CREDENTIALS_ID
- * EXTRA_FORMULAS
* FORMULAS_REVISION
* FORMULAS_SOURCE
* SALT_OPTS
diff --git a/test-salt-model-node.groovy b/test-salt-model-node.groovy
index ed525bd..60477ee 100644
--- a/test-salt-model-node.groovy
+++ b/test-salt-model-node.groovy
@@ -4,7 +4,6 @@
* DEFAULT_GIT_REF
* DEFAULT_GIT_URL
* CREDENTIALS_ID
- * EXTRA_FORMULAS
* CLUSTER_NAME
* NODE_TARGET
* SYSTEM_GIT_URL
@@ -74,7 +73,7 @@
testResult = saltModelTesting.setupAndTestNode(
NODE_TARGET,
CLUSTER_NAME,
- EXTRA_FORMULAS,
+ '',
workspace,
FORMULAS_SOURCE,
FORMULAS_REVISION,
diff --git a/test-salt-models-pipeline.groovy b/test-salt-models-pipeline.groovy
index 6a37ac7..f4467c1 100644
--- a/test-salt-models-pipeline.groovy
+++ b/test-salt-models-pipeline.groovy
@@ -3,7 +3,6 @@
* DEFAULT_GIT_URL default git url (will be used if pipeline run is not triggered by gerrit)
* DEFAULT_GIT_RED default git ref (branch,tag,...) (will be used if pipeline run is not triggered by gerrit)
* CREDENTIALS_ID Jenkins credetials id for git checkout
- * EXTRA_FORMULAS extra formulas list for passing to salt bootstrap script
* MAX_CPU_PER_JOB max cpu count for one docket test instance
* SYSTEM_GIT_URL reclass system git URL (optional)
* SYSTEM_GIT_REF reclass system git URL (optional)
@@ -102,7 +101,6 @@
[$class: 'StringParameterValue', name: 'CLUSTER_NAME', value: clusterName],
[$class: 'StringParameterValue', name: 'NODE_TARGET', value: testTarget],
[$class: 'StringParameterValue', name: 'FORMULAS_SOURCE', value: formulasSource],
- [$class: 'StringParameterValue', name: 'EXTRA_FORMULAS', value: EXTRA_FORMULAS],
[$class: 'StringParameterValue', name: 'FORMULAS_REVISION', value: FORMULAS_REVISION],
[$class: 'StringParameterValue', name: 'CREDENTIALS_ID', value: CREDENTIALS_ID],
[$class: 'StringParameterValue', name: 'SYSTEM_GIT_URL', value: SYSTEM_GIT_URL],