change max stack behavior with reusing
Stack limits shouldn't be applied when "HEAT_STACK_REUSE" is checked.
Change-Id: Ie803457d24c8ea9b6b01fa0ee27467d668ecea20
diff --git a/cicd-lab-pipeline.groovy b/cicd-lab-pipeline.groovy
index debb903..4c45d6e 100644
--- a/cicd-lab-pipeline.groovy
+++ b/cicd-lab-pipeline.groovy
@@ -81,7 +81,7 @@
openstackCloud = openstack.createOpenstackEnv(OPENSTACK_API_URL, OPENSTACK_API_CREDENTIALS, OPENSTACK_API_PROJECT)
openstack.getKeystoneToken(openstackCloud, openstackEnv)
wrap([$class: 'BuildUser']) {
- if (env.BUILD_USER_ID && !env.BUILD_USER_ID.equals("jenkins")) {
+ if (env.BUILD_USER_ID && !env.BUILD_USER_ID.equals("jenkins") && !HEAT_STACK_REUSE.toBoolean()) {
def existingStacks = openstack.getStacksForNameContains(openstackCloud, "${env.BUILD_USER_ID}-${JOB_NAME}", openstackEnv)
if(existingStacks.size() >= _MAX_PERMITTED_STACKS){
HEAT_STACK_DELETE = "false"
diff --git a/lab-pipeline.groovy b/lab-pipeline.groovy
index 36645a8..ddfe37a 100644
--- a/lab-pipeline.groovy
+++ b/lab-pipeline.groovy
@@ -47,7 +47,7 @@
salt = new com.mirantis.mk.Salt()
test = new com.mirantis.mk.Test()
-_MAX_PERMITTED_STACKS = 20
+_MAX_PERMITTED_STACKS = 2
overwriteFile = "/srv/salt/reclass/classes/cluster/overwrite.yml"
timestamps {
@@ -94,7 +94,7 @@
// Verify possibility of create stack for given user and stack type
//
wrap([$class: 'BuildUser']) {
- if (env.BUILD_USER_ID && !env.BUILD_USER_ID.equals("jenkins")) {
+ if (env.BUILD_USER_ID && !env.BUILD_USER_ID.equals("jenkins") && !HEAT_STACK_REUSE.toBoolean()) {
def existingStacks = openstack.getStacksForNameContains(openstackCloud, "${env.BUILD_USER_ID}-${JOB_NAME}", openstackEnv)
if(existingStacks.size() >= _MAX_PERMITTED_STACKS){
HEAT_STACK_DELETE = "false"