[tempest] Execute tempest tests on each lab where openstack installed
- Add test param to control TEST global variable
- Fill out test param in jobs with 'openstack' to trigger
tempest run on labs where openstack installed
Change-Id: Ie7ac87effa37822a8485cb6e0a0c81895f98fde2
diff --git a/jenkins/client/job/deploy/lab/mk/init.yml b/jenkins/client/job/deploy/lab/mk/init.yml
index bf58f39..6f95e30 100644
--- a/jenkins/client/job/deploy/lab/mk/init.yml
+++ b/jenkins/client/job/deploy/lab/mk/init.yml
@@ -29,7 +29,7 @@
default: "{{install}}"
TEST:
type: string
- default: ""
+ default: "{{test}}"
# heat
HEAT_TEMPLATE_URL:
diff --git a/jenkins/client/job/deploy/lab/mk/physical.yml b/jenkins/client/job/deploy/lab/mk/physical.yml
index a66909d..0767359 100644
--- a/jenkins/client/job/deploy/lab/mk/physical.yml
+++ b/jenkins/client/job/deploy/lab/mk/physical.yml
@@ -6,12 +6,16 @@
- lab: mcp10_contrail
install: core,kvm,openstack,contrail
stack_type: physical
+ test: openstack
- lab: mcp10_opencontrail_nfv
install: core,kvm,openstack,nfv
stack_type: physical
+ test: openstack
- lab: mcp10_dvr
install: core,kvm,openstack,dvr
stack_type: physical
+ test: openstack
- lab: mcp10_non_dvr
install: core,kvm,openstack
stack_type: physical
+ test: openstack
diff --git a/jenkins/client/job/deploy/lab/mk/virtual.yml b/jenkins/client/job/deploy/lab/mk/virtual.yml
index af65a4d..502066c 100644
--- a/jenkins/client/job/deploy/lab/mk/virtual.yml
+++ b/jenkins/client/job/deploy/lab/mk/virtual.yml
@@ -6,27 +6,36 @@
- lab: virtual_mcp05_dvr
install: core,openstack,dvr
stack_type: heat
+ test: openstack
- lab: virtual_mcp05_ovs
install: core,openstack,ovs
stack_type: heat
+ test: openstack
- lab: virtual_mcp10_contrail
install: core,openstack,contrail
stack_type: heat
+ test: openstack
- lab: virtual_mcp10_dvr
install: core,openstack,dvr
stack_type: heat
+ test: openstack
- lab: virtual_mcp10_ovs
install: core,openstack,ovs
stack_type: heat
+ test: openstack
- lab: virtual_mk20_advanced
install: core,openstack
stack_type: heat
+ test: openstack
- lab: virtual_mk20_basic
install: core,openstack
stack_type: heat
+ test: openstack
- lab: virtual_mk22_advanced
install: core,openstack
stack_type: heat
+ test: openstack
- lab: virtual_mk22_basic
install: core,openstack
stack_type: heat
+ test: openstack