Merge "FUN sprint 23"
diff --git a/cinder/control/backend/solidfire.yml b/cinder/control/backend/solidfire.yml
index 20d708c..b2fbee6 100644
--- a/cinder/control/backend/solidfire.yml
+++ b/cinder/control/backend/solidfire.yml
@@ -1,8 +1,8 @@
parameters:
cinder:
controller:
- defaul_volume_type: normal-storage
- backend:
+ default_volume_type: normal-storage
+ backend:
solidfire:
engine: solidfire
type_name: normal-storage
@@ -11,4 +11,4 @@
san_login: ${_param:san_login}
san_password: ${_param:san_password}
clustername: ${_param:san_cluster_name}
- sf_emulate_512: true
\ No newline at end of file
+ sf_emulate_512: true
diff --git a/jenkins/client/job/deploy/lab/release/mcp10.yml b/jenkins/client/job/deploy/lab/release/mcp10.yml
index 34fb940..66f08af 100644
--- a/jenkins/client/job/deploy/lab/release/mcp10.yml
+++ b/jenkins/client/job/deploy/lab/release/mcp10.yml
@@ -37,13 +37,13 @@
stack_test: ""
job_timer: "H H(0-6) * * *"
- stack_name: virtual_mcp10_ovs_dvr
- stack_env: devcloud_virtual_mcp10_dvr
+ stack_env: devcloud
stack_install: core,openstack,dvr
stack_type: heat
stack_test: ""
job_timer: "H H(0-6) * * *"
- stack_name: virtual_mcp10_ovs
- stack_env: devcloud_virtual_mcp10_ovs
+ stack_env: devcloud
stack_install: core,openstack,ovs
stack_type: heat
stack_test: ""
diff --git a/jenkins/client/job/deploy/lab/release/mcp11.yml b/jenkins/client/job/deploy/lab/release/mcp11.yml
index 5c0f4d4..657e1d1 100644
--- a/jenkins/client/job/deploy/lab/release/mcp11.yml
+++ b/jenkins/client/job/deploy/lab/release/mcp11.yml
@@ -10,13 +10,13 @@
stack_test: ""
job_timer: ""
- stack_name: virtual_mcp11_dvr
- stack_env: devcloud_virtual_mcp11_dvr
+ stack_env: devcloud
stack_install: core,openstack,dvr
stack_type: heat
stack_test: ""
job_timer: ""
- stack_name: virtual_mcp11_ovs
- stack_env: devcloud_virtual_mcp11_ovs
+ stack_env: devcloud
stack_install: core,openstack,ovs
stack_type: heat
stack_test: ""
@@ -57,3 +57,27 @@
stack_type: heat
stack_test: ""
job_timer: "H H(0-6) * * *"
+ - stack_name: virtual_mcp_mitaka_ovs
+ stack_env: devcloud
+ stack_install: core,openstack,ovs
+ stack_type: heat
+ stack_test: ""
+ job_timer: ""
+ - stack_name: virtual_mcp_mitaka_dvr
+ stack_env: devcloud
+ stack_install: core,openstack,dvr
+ stack_type: heat
+ stack_test: ""
+ job_timer: ""
+ - stack_name: virtual_mcp_newton_ovs
+ stack_env: devcloud
+ stack_install: core,openstack,ovs
+ stack_type: heat
+ stack_test: ""
+ job_timer: ""
+ - stack_name: virtual_mcp_newton_dvr
+ stack_env: devcloud
+ stack_install: core,openstack,dvr
+ stack_type: heat
+ stack_test: ""
+ job_timer: ""
diff --git a/jenkins/client/job/gating.yml b/jenkins/client/job/gating.yml
index f9e9b1a..1ed093e 100644
--- a/jenkins/client/job/gating.yml
+++ b/jenkins/client/job/gating.yml
@@ -25,9 +25,9 @@
template:
discard:
build:
- keep_num: 25
+ keep_num: 150
artifact:
- keep_num: 25
+ keep_num: 150
type: workflow-scm
concurrent: true
scm: