commit 66b4d76a446aa4fc63e34f927a81f37ddeb71dc8
author Jakub Josef <jakub.josef@gmail.com> Wed May 24 09:41:11 2017 +0000
committer Gerrit Code Review <gerrit2@5776b83a74fe> Wed May 24 09:41:12 2017 +0000
tree c91e75cae5df8c479a8f0e45f2a5ad74894af434
parent 1d7e00cea29b15a9f542ebe719e91901054ff267
parent ca7e4564112ae8d88041cc3a9da3a23abf33df5d

Merge "Changed name of deploy job params"

jenkins/client/job/deploy/lab/mk/cloud.yml

diff --git a/jenkins/client/job/deploy/lab/mk/cloud.yml b/jenkins/client/job/deploy/lab/mk/cloud.yml
index cbbcd34..80d7c58 100644
--- a/jenkins/client/job/deploy/lab/mk/cloud.yml
+++ b/jenkins/client/job/deploy/lab/mk/cloud.yml
@@ -64,6 +64,9 @@
               STACK_TEMPLATE_BRANCH:
                 type: string
                 default: "master"
+              STACK_CLEANUP_JOB:
+                type: string
+                default: ''
 
               # salt master
               SALT_MASTER_CREDENTIALS:

jenkins/client/job/deploy/lab/mk/init.yml

diff --git a/jenkins/client/job/deploy/lab/mk/init.yml b/jenkins/client/job/deploy/lab/mk/init.yml
index 1d57f5d..9e988ba 100644
--- a/jenkins/client/job/deploy/lab/mk/init.yml
+++ b/jenkins/client/job/deploy/lab/mk/init.yml
@@ -27,10 +27,10 @@
               STACK_TYPE:
                 type: string
                 default: "{{stack_type}}"
-              INSTALL:
+              STACK_INSTALL:
                 type: string
                 default: "{{install}}"
-              TEST:
+              STACK_TEST:
                 type: string
                 default: "{{test}}"
 
@@ -56,7 +56,9 @@
               STACK_REUSE:
                 type: boolean
                 default: 'false'
-                
+              STACK_CLEANUP_JOB:
+                type: string
+                default: 'deploy-heat-cleanup'
               # heat
               HEAT_STACK_ENVIRONMENT:
                 type: string