| commit | 5b0ed26b93dbb21951fa6acec85f970d70f2d54c | [log] [tgz] |
|---|---|---|
| author | Jenkins <jenkins@localhost> | Thu Mar 23 15:21:45 2017 +0000 |
| committer | Jenkins <jenkins@localhost> | Thu Mar 23 15:21:45 2017 +0000 |
| tree | 744072c198e078962ad6bac675e4f838981f44bb | |
| parent | 89d22cbcff4650918c5794cb5f5982cacefd426e [diff] | |
| parent | 17ad394be12095bbcc1e27e535cce96219618d52 [diff] |
Merge remote-tracking branch 'target/master'
diff --git a/jenkins/client/job/deploy/lab/mk/init.yml b/jenkins/client/job/deploy/lab/mk/init.yml index 7da9149..44b4b3d 100644 --- a/jenkins/client/job/deploy/lab/mk/init.yml +++ b/jenkins/client/job/deploy/lab/mk/init.yml
@@ -102,3 +102,7 @@ type: string default: "sandbox-docker-prod-local.docker.mirantis.net/mirantis/rally_tempest:0.1" + ASK_ON_ERROR: + type: boolean + default: 'false' +
diff --git a/jenkins/client/job/deploy/openstack.yml b/jenkins/client/job/deploy/openstack.yml index 48de021..644b16b 100644 --- a/jenkins/client/job/deploy/openstack.yml +++ b/jenkins/client/job/deploy/openstack.yml
@@ -31,3 +31,6 @@ SALT_MASTER_URL: type: string default: "" + ASK_ON_ERROR: + type: boolean + default: 'false'