Merge "Fix jmx_exporter"
diff --git a/cloud-deploy-pipeline.groovy b/cloud-deploy-pipeline.groovy
index 7d331bf..4b1a521 100644
--- a/cloud-deploy-pipeline.groovy
+++ b/cloud-deploy-pipeline.groovy
@@ -119,7 +119,7 @@
'instance_zone': HEAT_STACK_ZONE,
'public_net': HEAT_STACK_PUBLIC_NET
]
- openstack.createHeatStack(openstackCloud, STACK_NAME, STACK_TEMPLATE, envParams, HEAT_STACK_ENVIRONMENT, openstackEnv)
+ openstack.createHeatStack(openstackCloud, STACK_NAME, STACK_TEMPLATE, envParams, HEAT_STACK_ENVIRONMENT, openstackEnv, false)
}
}
diff --git a/gating-pipeline.groovy b/gating-pipeline.groovy
index a870ad4..68c1095 100644
--- a/gating-pipeline.groovy
+++ b/gating-pipeline.groovy
@@ -19,7 +19,7 @@
stage("test") {
if (gerritChange.status != "MERGED" && !SKIP_TEST.equals("true")){
// test max CodeReview
- if(gerrit.patchsetHasApproval(gerritChange.currentPatchSet,"CodeReview", "+")){
+ if(gerrit.patchsetHasApproval(gerritChange.currentPatchSet,"Code-Review", "+")){
doSubmit = true
wrap([$class: 'AnsiColorBuildWrapper']) {
def gerritProjectArray = GERRIT_PROJECT.tokenize("/")
diff --git a/test-salt-model-node.groovy b/test-salt-model-node.groovy
index 117971b..185e4c3 100644
--- a/test-salt-model-node.groovy
+++ b/test-salt-model-node.groovy
@@ -52,7 +52,7 @@
stage("test node") {
if (checkouted) {
def workspace = common.getWorkspace()
- saltModelTesting.setupAndTestNode(NODE_TARGET, EXTRA_FORMULAS, workspace, FORMULAS_SOURCE)
+ saltModelTesting.setupAndTestNode(NODE_TARGET, EXTRA_FORMULAS, workspace, FORMULAS_SOURCE, FORMULAS_REVISION)
}
}
} catch (Throwable e) {
diff --git a/test-salt-models-pipeline.groovy b/test-salt-models-pipeline.groovy
index 7278e8d..1ed95f5 100644
--- a/test-salt-models-pipeline.groovy
+++ b/test-salt-models-pipeline.groovy
@@ -99,6 +99,7 @@
[$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],
[$class: 'StringParameterValue', name: 'SYSTEM_GIT_REF', value: SYSTEM_GIT_REF]