Merge "Add akholkin user into Stacklight team members"
diff --git a/jenkins/client/job/deploy/lab/mk/init.yml b/jenkins/client/job/deploy/lab/mk/init.yml
index 2a32dc6..7a441b6 100644
--- a/jenkins/client/job/deploy/lab/mk/init.yml
+++ b/jenkins/client/job/deploy/lab/mk/init.yml
@@ -105,6 +105,10 @@
type: string
default: "sandbox-docker-prod-local.docker.mirantis.net/mirantis/rally_tempest:0.1"
+ # Salt master setup extra formulas
+ EXTRA_FORMULAS:
+ type: string
+ default: "{{extra_formulas}}"
ASK_ON_ERROR:
type: boolean
default: 'false'
diff --git a/jenkins/client/job/deploy/lab/mk/physical.yml b/jenkins/client/job/deploy/lab/mk/physical.yml
index 8e6d498..b04ba23 100644
--- a/jenkins/client/job/deploy/lab/mk/physical.yml
+++ b/jenkins/client/job/deploy/lab/mk/physical.yml
@@ -8,18 +8,22 @@
stack_type: physical
test: openstack
timer: ""
+ extra_formulas: ""
- lab: mcp10_opencontrail_nfv
install: core,kvm,openstack,nfv
stack_type: physical
test: openstack
timer: ""
+ extra_formulas: ""
- lab: mcp10_dvr
install: core,kvm,openstack,dvr
stack_type: physical
test: openstack
timer: ""
+ extra_formulas: ""
- lab: mcp10_non_dvr
install: core,kvm,openstack
stack_type: physical
test: openstack
timer: ""
+ extra_formulas: ""
diff --git a/jenkins/client/job/deploy/lab/mk/virtual.yml b/jenkins/client/job/deploy/lab/mk/virtual.yml
index 337d93d..e615408 100644
--- a/jenkins/client/job/deploy/lab/mk/virtual.yml
+++ b/jenkins/client/job/deploy/lab/mk/virtual.yml
@@ -9,72 +9,86 @@
stack_type: heat
test: openstack
timer: ""
+ extra_formulas: ""
- lab: virtual_mk20_basic
install: core,openstack
stack_type: heat
test: openstack
timer: ""
+ extra_formulas: ""
# mk22
- lab: virtual_mk22_advanced
install: core,openstack
stack_type: heat
test: openstack
timer: ""
+ extra_formulas: ""
- lab: virtual_mk22_basic
install: core,openstack
stack_type: heat
test: openstack
timer: ""
+ extra_formulas: ""
# mcp05
- lab: virtual_mcp05_dvr
install: core,openstack,dvr
stack_type: heat
test: openstack
timer: ""
+ extra_formulas: ""
- lab: virtual_mcp05_ovs
install: core,openstack,ovs
stack_type: heat
test: openstack
timer: ""
+ extra_formulas: ""
# mcp10
- lab: virtual_mcp10_contrail
install: core,openstack,contrail
stack_type: heat
test: openstack
timer: "H H(0-6) * * *"
+ extra_formulas: ""
- lab: virtual_mcp10_dvr
install: core,openstack,dvr
stack_type: heat
test: openstack
timer: "H H(0-6) * * *"
+ extra_formulas: ""
- lab: virtual_mcp10_ovs
install: core,openstack,ovs
stack_type: heat
test: openstack
timer: "H H(0-6) * * *"
+ extra_formulas: ""
# mcp11
- lab: virtual_mcp11_contrail
install: core,openstack,contrail
stack_type: heat
test: openstack
+ extra_formulas: ""
timer: ""
- lab: virtual_mcp11_dvr
install: core,openstack,dvr
stack_type: heat
test: openstack
timer: ""
+ extra_formulas: ""
- lab: virtual_mcp11_ovs
install: core,openstack,ovs
stack_type: heat
test: openstack
timer: ""
+ extra_formulas: ""
- lab: virtual_mcp11_k8s_calico
install: core,k8s,calico
stack_type: heat
test: k8s
timer: "H H(0-6) * * *"
+ extra_formulas: ""
- lab: virtual_mcp11_k8s_contrail
install: core,k8s,contrail
stack_type: heat
test: k8s
timer: "H H(0-6) * * *"
+ extra_formulas: ""
diff --git a/jenkins/client/job/test_devops_portal.yml b/jenkins/client/job/test_devops_portal.yml
index aae2d67..41be263 100644
--- a/jenkins/client/job/test_devops_portal.yml
+++ b/jenkins/client/job/test_devops_portal.yml
@@ -38,6 +38,9 @@
CREDENTIALS_ID:
type: string
default: "gerrit"
+ JSON_CONFIG:
+ type: string
+ default: '{"services": {"elasticsearch": {"endpoint": "http://elasticsearch:9200"}}}'
NODE_IMAGE:
type: string
default: "docker-sandbox.sandbox.mirantis.net/ikharin/ci/node-firefox:6.10"
diff --git a/opencontrail/control/cluster.yml b/opencontrail/control/cluster.yml
index 4ffe081..7e30779 100644
--- a/opencontrail/control/cluster.yml
+++ b/opencontrail/control/cluster.yml
@@ -13,8 +13,6 @@
version: 0.9.0-0contrail0
python-kafka:
version: 1.0.1-0contrail1
- contrail-api-cli:
- version: latest
opencontrail:
web:
database: