Added stack_env to the deploy stacks
Change-Id: I955cb400b7a3a5b498c3a441f1f1b644c3dbb0b3
diff --git a/jenkins/client/job/deploy/lab/component/aaa.yml b/jenkins/client/job/deploy/lab/component/aaa.yml
index 61d0b60..1c640d5 100644
--- a/jenkins/client/job/deploy/lab/component/aaa.yml
+++ b/jenkins/client/job/deploy/lab/component/aaa.yml
@@ -4,6 +4,7 @@
_param:
jenkins_deploy_jobs:
- stack_name: aaa_ha_freeipa
+ stack_env: devcloud
stack_type: heat
stack_install: core,aaa
stack_test: ""
diff --git a/jenkins/client/job/deploy/lab/component/ceph.yml b/jenkins/client/job/deploy/lab/component/ceph.yml
index 0d84374..b0b3af1 100644
--- a/jenkins/client/job/deploy/lab/component/ceph.yml
+++ b/jenkins/client/job/deploy/lab/component/ceph.yml
@@ -4,6 +4,7 @@
_param:
jenkins_deploy_jobs:
- stack_name: ceph_ha
+ stack_env: devcloud
stack_type: heat
stack_install: core,ceph
stack_test: "ceph"
diff --git a/jenkins/client/job/deploy/lab/component/drivetrain.yml b/jenkins/client/job/deploy/lab/component/drivetrain.yml
index e9e00e7..945ac4a 100644
--- a/jenkins/client/job/deploy/lab/component/drivetrain.yml
+++ b/jenkins/client/job/deploy/lab/component/drivetrain.yml
@@ -4,11 +4,13 @@
_param:
jenkins_deploy_jobs:
- stack_name: drivetrain_ha
+ stack_env: devcloud
stack_type: heat
stack_install: core
stack_test: ""
job_timer: ""
- stack_name: drivetrain_ha_clusters
+ stack_env: devcloud
stack_type: heat
stack_install: core
stack_test: ""
diff --git a/jenkins/client/job/deploy/lab/component/kubernetes.yml b/jenkins/client/job/deploy/lab/component/kubernetes.yml
index 9e80c64..5ef3bd9 100644
--- a/jenkins/client/job/deploy/lab/component/kubernetes.yml
+++ b/jenkins/client/job/deploy/lab/component/kubernetes.yml
@@ -4,26 +4,31 @@
_param:
jenkins_deploy_jobs:
- stack_name: k8s_aio_calico
+ stack_env: devcloud
stack_type: heat
stack_install: core,k8s,calico
stack_test: ""
job_timer: ""
- stack_name: k8s_aio_contrail
+ stack_env: devcloud
stack_type: heat
stack_install: core,k8s,contrail
stack_test: ""
job_timer: ""
- stack_name: k8s_ha_calico
+ stack_env: devcloud
stack_type: aws
stack_install: core,k8s,calico
stack_test: ""
job_timer: "H H(0-6) * * *"
- stack_name: k8s_ha_calico
+ stack_env: devcloud
stack_type: heat
stack_install: core,k8s,calico
stack_test: ""
job_timer: "H H(0-6) * * *"
- stack_name: k8s_ha_contrail
+ stack_env: devcloud
stack_type: heat
stack_install: core,k8s,contrail
stack_test: ""
diff --git a/jenkins/client/job/deploy/lab/component/openstack.yml b/jenkins/client/job/deploy/lab/component/openstack.yml
index 33c03f3..1e1d334 100644
--- a/jenkins/client/job/deploy/lab/component/openstack.yml
+++ b/jenkins/client/job/deploy/lab/component/openstack.yml
@@ -4,20 +4,24 @@
_param:
jenkins_deploy_jobs:
- stack_name: os_aio_contrail
+ stack_env: devcloud
stack_type: heat
stack_install: core,openstack,contrail
stack_test: ""
job_timer: ""
- stack_name: os_aio_ovs
+ stack_env: devcloud
stack_type: heat
stack_install: core,openstack,ovs
job_timer: ""
- stack_name: os_ha_contrail
+ stack_env: devcloud
stack_type: heat
stack_install: core,openstack,contrail
stack_test: ""
job_timer: "H H(0-6) * * *"
- stack_name: os_ha_ovs
+ stack_env: devcloud
stack_type: heat
stack_install: core,openstack,ovs
stack_test: ""
diff --git a/jenkins/client/job/deploy/lab/component/stacklight.yml b/jenkins/client/job/deploy/lab/component/stacklight.yml
index 2802e13..94ccce2 100644
--- a/jenkins/client/job/deploy/lab/component/stacklight.yml
+++ b/jenkins/client/job/deploy/lab/component/stacklight.yml
@@ -4,16 +4,19 @@
_param:
jenkins_deploy_jobs:
- stack_name: stacklight_k8s_calico
+ stack_env: devcloud
stack_type: heat
stack_install: core,k8s,calico,stacklight
stack_test: ""
job_timer: "H H(0-6) * * *"
- stack_name: stacklight_os_contrail
+ stack_env: devcloud
stack_type: heat
stack_install: core,openstack,contrail,stacklight
stack_test: ""
job_timer: "H H(0-6) * * *"
- stack_name: stacklight_os_ovs
+ stack_env: devcloud
stack_type: heat
stack_install: core,openstack,ovs,stacklight
stack_test: ""
diff --git a/jenkins/client/job/deploy/lab/deploy.yml b/jenkins/client/job/deploy/lab/deploy.yml
index 5d87340..75bab43 100644
--- a/jenkins/client/job/deploy/lab/deploy.yml
+++ b/jenkins/client/job/deploy/lab/deploy.yml
@@ -94,7 +94,7 @@
# heat
HEAT_STACK_ENVIRONMENT:
type: string
- default: "devcloud"
+ default: "{{stack_env}}"
HEAT_STACK_ZONE:
type: string
default: "mcp-mk"
diff --git a/jenkins/client/job/deploy/lab/release/mcp05.yml b/jenkins/client/job/deploy/lab/release/mcp05.yml
index 3dbc25f..5ec2787 100644
--- a/jenkins/client/job/deploy/lab/release/mcp05.yml
+++ b/jenkins/client/job/deploy/lab/release/mcp05.yml
@@ -4,11 +4,13 @@
_param:
jenkins_deploy_jobs:
- stack_name: virtual_mcp05_dvr
+ stack_env: virtual_mcp05_dvr/devcloud
stack_install: core,openstack,dvr
stack_type: heat
stack_test: ""
job_timer: ""
- stack_name: virtual_mcp05_ovs
+ stack_env: virtual_mcp05_ovs/devcloud
stack_install: core,openstack,ovs
stack_type: heat
stack_test: ""
diff --git a/jenkins/client/job/deploy/lab/release/mcp10.yml b/jenkins/client/job/deploy/lab/release/mcp10.yml
index e8905ac..516d533 100644
--- a/jenkins/client/job/deploy/lab/release/mcp10.yml
+++ b/jenkins/client/job/deploy/lab/release/mcp10.yml
@@ -5,21 +5,25 @@
jenkins_deploy_jobs:
# physical
- stack_name: mcp10_contrail
+ stack_env: mcp10_contrail/devcloud
stack_install: core,kvm,openstack,contrail
stack_type: physical
stack_test: openstack
job_timer: ""
- stack_name: mcp10_opencontrail_nfv
+ stack_env: mcp10_opencontrail_nfv/devcloud
stack_install: core,kvm,openstack,nfv
stack_type: physical
stack_test: openstack
job_timer: ""
- stack_name: mcp10_dvr
+ stack_env: mcp10_dvr/devcloud
stack_install: core,kvm,openstack,dvr
stack_type: physical
stack_test: openstack
job_timer: ""
- stack_name: mcp10_non_dvr
+ stack_env: mcp10_non_dvr/devcloud
stack_install: core,kvm,openstack
stack_type: physical
stack_test: openstack
@@ -27,16 +31,19 @@
# virtual
- stack_name: virtual_mcp10_contrail
+ stack_env: virtual_mcp10_contrail/devcloud
stack_install: core,openstack,contrail
stack_type: heat
stack_test: ""
job_timer: "H H(0-6) * * *"
- stack_name: virtual_mcp10_dvr
+ stack_env: virtual_mcp10_dvr/devcloud
stack_install: core,openstack,dvr
stack_type: heat
stack_test: ""
job_timer: "H H(0-6) * * *"
- stack_name: virtual_mcp10_ovs
+ stack_env: virtual_mcp10_ovs/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 98c8a5c..27f2184 100644
--- a/jenkins/client/job/deploy/lab/release/mcp11.yml
+++ b/jenkins/client/job/deploy/lab/release/mcp11.yml
@@ -4,46 +4,55 @@
_param:
jenkins_deploy_jobs:
- stack_name: virtual_mcp11_contrail
+ stack_env: virtual_mcp11_contrail/devcloud
stack_install: core,openstack,contrail
stack_type: heat
stack_test: ""
job_timer: ""
- stack_name: virtual_mcp11_dvr
+ stack_env: virtual_mcp11_dvr/devcloud
stack_install: core,openstack,dvr
stack_type: heat
stack_test: ""
job_timer: ""
- stack_name: virtual_mcp11_ovs
+ stack_env: virtual_mcp11_ovs/devcloud
stack_install: core,openstack,ovs
stack_type: heat
stack_test: ""
job_timer: ""
- stack_name: virtual_mcp11_ironic_small
+ stack_env: virtual_mcp11_ironic_small/devcloud
stack_install: core,openstack
stack_type: heat
stack_test: ""
job_timer: ""
- stack_name: virtual_mcp11_aio
+ stack_env: virtual_mcp11_aio/devcloud
stack_install: core,openstack
stack_type: heat
stack_test: ""
job_timer: ""
- stack_name: virtual_mcp11_k8s_calico
+ stack_env: virtual_mcp11_k8s_calico/devcloud
stack_install: core,k8s,calico
stack_type: heat
stack_test: k8s
job_timer: "H H(0-6) * * *"
- stack_name: virtual_mcp11_k8s_contrail
+ stack_env: virtual_mcp11_k8s_contrail/devcloud
stack_install: core,k8s,contrail
stack_type: heat
stack_test: k8s
job_timer: "H H(0-6) * * *"
- stack_name: virtual_mcp11_contrail_nfv
+ stack_env: virtual_mcp11_contrail_nfv/devcloud
stack_install: core,openstack,contrail
stack_type: heat
stack_test: ""
job_timer: "H H(0-6) * * *"
- stack_name: virtual_mcp11_ovs_dpdk
+ stack_env: virtual_mcp11_ovs_dpdk/devcloud
stack_install: core,openstack,ovs
stack_type: heat
stack_test: ""
diff --git a/jenkins/client/job/deploy/lab/release/mk.yml b/jenkins/client/job/deploy/lab/release/mk.yml
index 4fce1c5..1be1057 100644
--- a/jenkins/client/job/deploy/lab/release/mk.yml
+++ b/jenkins/client/job/deploy/lab/release/mk.yml
@@ -5,22 +5,26 @@
jenkins_deploy_jobs:
# mk20
- stack_name: virtual_mk20_advanced
+ stack_env: virtual_mk20_advanced/devcloud
stack_install: core,openstack
stack_type: heat
stack_test: ""
job_timer: ""
- stack_name: virtual_mk20_basic
+ stack_env: virtual_mk20_basic/devcloud
stack_install: core,openstack
stack_type: heat
stack_test: ""
job_timer: ""
# mk22
- stack_name: virtual_mk22_advanced
+ stack_env: virtual_mk22_advanced/devcloud
stack_install: core,openstack
stack_type: heat
stack_test: ""
job_timer: ""
- stack_name: virtual_mk22_basic
+ stack_env: virtual_mk22_basic/devcloud
stack_install: core,openstack
stack_type: heat
stack_test: ""