unify test variables, disable openstack test
Openstack tests are disable untils it will start to work. Testing
process is failing and problem is not in tempest but in way how tests
are started.
Change-Id: Ic85d6002afaa7028b52fe3bd951b803b018e6214
diff --git a/jenkins/client/job/deploy/lab/mk/cloud.yml b/jenkins/client/job/deploy/lab/mk/cloud.yml
index 6a18b42..81e2121 100644
--- a/jenkins/client/job/deploy/lab/mk/cloud.yml
+++ b/jenkins/client/job/deploy/lab/mk/cloud.yml
@@ -213,15 +213,15 @@
default: "public"
# k8s setttings
- K8S_API_SERVER:
+ TEST_K8S_API_SERVER:
type: string
default: "http://127.0.0.1:8080"
- K8S_CONFORMANCE_IMAGE:
+ TEST_K8S_CONFORMANCE_IMAGE:
type: string
default: "docker-dev-virtual.docker.mirantis.net/mirantis/kubernetes/k8s-conformance:v1.5.1-3_1482332392819"
# openstack settings
- TEMPEST_IMAGE:
+ TEST_TEMPEST_IMAGE:
type: string
default: "sandbox-docker-prod-local.docker.mirantis.net/mirantis/rally_tempest:0.1"
diff --git a/jenkins/client/job/deploy/lab/mk/init.yml b/jenkins/client/job/deploy/lab/mk/init.yml
index b9d486d..996400e 100644
--- a/jenkins/client/job/deploy/lab/mk/init.yml
+++ b/jenkins/client/job/deploy/lab/mk/init.yml
@@ -108,27 +108,27 @@
default: "default"
# k8s setttings
- K8S_API_SERVER:
+ TEST_K8S_API_SERVER:
type: string
default: "http://127.0.0.1:8080"
- K8S_CONFORMANCE_IMAGE:
+ TEST_K8S_CONFORMANCE_IMAGE:
type: string
default: "docker-dev-virtual.docker.mirantis.net/mirantis/kubernetes/k8s-conformance:v1.5.1-3_1482332392819"
# Tempest settings
- TEMPEST_IMAGE:
+ TEST_TEMPEST_IMAGE:
type: string
description: "Tempest image link"
default: "sandbox-docker-prod-local.docker.mirantis.net/mirantis/rally_tempest:0.1"
- TARGET_TEST_NODE:
+ TEST_TEMPEST_TARGET:
type: string
description: "Node to run tests"
default: ""
- DOCKER_INSTALL:
+ TEST_DOCKER_INSTALL:
type: boolean
description: "Install docker on the target if true"
default: "true"
- PATTERN:
+ TEST_TEMPEST_PATTERN:
type: string
description: "Run tests matched to pattern only"
default: ""
diff --git a/jenkins/client/job/deploy/lab/mk/virtual.yml b/jenkins/client/job/deploy/lab/mk/virtual.yml
index dd273ed..31b035f 100644
--- a/jenkins/client/job/deploy/lab/mk/virtual.yml
+++ b/jenkins/client/job/deploy/lab/mk/virtual.yml
@@ -7,89 +7,89 @@
- lab: virtual_mk20_advanced
install: core,openstack
stack_type: heat
- test: openstack
+ test: ""
timer: ""
extra_formulas: ""
- lab: virtual_mk20_basic
install: core,openstack
stack_type: heat
- test: openstack
+ test: ""
timer: ""
extra_formulas: ""
# mk22
- lab: virtual_mk22_advanced
install: core,openstack
stack_type: heat
- test: openstack
+ test: ""
timer: ""
extra_formulas: ""
- lab: virtual_mk22_basic
install: core,openstack
stack_type: heat
- test: openstack
+ test: ""
timer: ""
extra_formulas: ""
# mcp05
- lab: virtual_mcp05_dvr
install: core,openstack,dvr
stack_type: heat
- test: openstack
+ test: ""
timer: ""
extra_formulas: ""
- lab: virtual_mcp05_ovs
install: core,openstack,ovs
stack_type: heat
- test: openstack
+ test: ""
timer: ""
extra_formulas: ""
# mcp10
- lab: virtual_mcp10_contrail
install: core,openstack,contrail
stack_type: heat
- test: openstack
+ test: ""
timer: "H H(0-6) * * *"
extra_formulas: ""
- lab: virtual_mcp10_dvr
install: core,openstack,dvr
stack_type: heat
- test: openstack
+ test: ""
timer: "H H(0-6) * * *"
extra_formulas: ""
- lab: virtual_mcp10_ovs
install: core,openstack,ovs
stack_type: heat
- test: openstack
+ test: ""
timer: "H H(0-6) * * *"
extra_formulas: ""
# mcp11
- lab: virtual_mcp11_contrail
install: core,openstack,contrail
stack_type: heat
- test: openstack
+ test: ""
extra_formulas: ""
timer: ""
- lab: virtual_mcp11_dvr
install: core,openstack,dvr
stack_type: heat
- test: openstack
+ test: ""
timer: ""
extra_formulas: ""
- lab: virtual_mcp11_ovs
install: core,openstack,ovs
stack_type: heat
- test: openstack
+ test: ""
timer: ""
extra_formulas: ""
- lab: virtual_mcp11_ironic_small
install: core,openstack
stack_type: heat
- test: openstack
+ test: ""
timer: ""
extra_formulas: ""
- lab: virtual_mcp11_aio
install: core,openstack
stack_type: heat
- test: openstack
+ test: ""
timer: ""
extra_formulas: ""
- lab: virtual_mcp11_k8s_calico
@@ -107,13 +107,13 @@
- lab: virtual_mcp11_contrail_nfv
install: core,openstack,contrail
stack_type: heat
- test: openstack
+ test: ""
timer: "H H(0-6) * * *"
extra_formulas: ""
- lab: virtual_mcp11_ovs_dpdk
install: core,openstack,ovs
stack_type: heat
- test: openstack
+ test: ""
timer: "H H(0-6) * * *"
extra_formulas: ""
# Identity AAA