Merge "Add mcp11-contrail-nfv and mcp-ovs-dpdk deploy jobs"
diff --git a/docker/swarm/stack/monitoring.yml b/docker/swarm/stack/monitoring/init.yml
similarity index 98%
rename from docker/swarm/stack/monitoring.yml
rename to docker/swarm/stack/monitoring/init.yml
index a11024d..2cbdfdc 100644
--- a/docker/swarm/stack/monitoring.yml
+++ b/docker/swarm/stack/monitoring/init.yml
@@ -5,6 +5,7 @@
- service.prometheus.remote_storage_adapter.container
- system.prometheus.server
- system.prometheus.alertmanager
+- system.telegraf.agent.remote
parameters:
docker:
client:
diff --git a/docker/swarm/stack/monitoring/remote_collector.yml b/docker/swarm/stack/monitoring/remote_collector.yml
new file mode 100644
index 0000000..ff6af95
--- /dev/null
+++ b/docker/swarm/stack/monitoring/remote_collector.yml
@@ -0,0 +1,29 @@
+classes:
+- system.heka.remote_collector.container
+- system.heka.remote_collector.input.amqp
+- system.heka.remote_collector.output.elasticsearch
+- system.heka.remote_collector.output.telegraf
+- system.telegraf.agent.remote.input.http_listener
+parameters:
+ docker:
+ client:
+ stack:
+ monitoring:
+ service:
+ remote_collector:
+ networks:
+ - monitoring
+ deploy:
+ replicas: 1
+ labels:
+ com.mirantis.monitoring: "remote_collector"
+ restart_policy:
+ condition: any
+ labels:
+ com.mirantis.monitoring: "remote_collector"
+ image: ${_param:docker_image_remote_collector}
+ volumes:
+ - ${heka:remote_collector:prefix_dir}/etc/remote_collector:/etc/heka
+ - ${heka:remote_collector:prefix_dir}/usr/share/lma_collector:/usr/share/lma_collector
+ environment:
+ HEKA_CACHE_DIR: /var/cache/remote_collector
diff --git a/jenkins/client/job/deploy/lab/mk/cloud.yml b/jenkins/client/job/deploy/lab/mk/cloud.yml
index 7461acf..5b15f35 100644
--- a/jenkins/client/job/deploy/lab/mk/cloud.yml
+++ b/jenkins/client/job/deploy/lab/mk/cloud.yml
@@ -9,6 +9,62 @@
stack_type: aws
stack_install: core,k8s,calico
job_timer: "H H * * *"
+# - stack_name: ceph_ha
+# stack_type: heat
+# stack_install: core
+# job_timer: ""
+# - stack_name: drivetrain_ha
+# stack_type: heat
+# stack_install: core
+# job_timer: ""
+# - stack_name: drivetrain_ha_clusters
+# stack_type: heat
+# stack_install: core
+# job_timer: ""
+ - stack_name: k8s_aio_calico
+ stack_type: heat
+ stack_install: core,k8s,calico
+ job_timer: ""
+ - stack_name: k8s_aio_contrail
+ stack_type: heat
+ stack_install: core,k8s,contrail
+ job_timer: ""
+ - stack_name: k8s_ha_calico
+ stack_type: heat
+ stack_install: core,k8s,calico
+ job_timer: ""
+ - stack_name: k8s_ha_contrail
+ stack_type: heat
+ stack_install: core,k8s,contrail
+ job_timer: ""
+ - stack_name: os_aio_contrail
+ stack_type: heat
+ stack_install: core,openstack,contrail
+ job_timer: ""
+ - stack_name: os_aio_ovs
+ stack_type: heat
+ stack_install: core,openstack,ovs
+ job_timer: ""
+ - stack_name: os_ha_contrail
+ stack_type: heat
+ stack_install: core,openstack,contrail
+ job_timer: ""
+ - stack_name: os_ha_ovs
+ stack_type: heat
+ stack_install: core,openstack,ovs
+ job_timer: ""
+ - stack_name: stacklight_k8s_calico
+ stack_type: heat
+ stack_install: core,k8s,calico,stacklight
+ job_timer: ""
+ - stack_name: stacklight_os_contrail
+ stack_type: heat
+ stack_install: core,openstack,contrail,stacklight
+ job_timer: ""
+ - stack_name: stacklight_os_ovs
+ stack_type: heat
+ stack_install: core,openstack,ovs,stacklight
+ job_timer: ""
jenkins:
client:
job_template:
@@ -83,6 +139,9 @@
SALT_MASTER_URL:
type: string
default: ""
+ SALT_OVERRIDES:
+ type: text
+ default: ""
# aws api
AWS_STACK_REGION:
diff --git a/jenkins/client/job/salt-models/tests.yml b/jenkins/client/job/salt-models/tests.yml
index 4ed1f62..e59ae6a 100644
--- a/jenkins/client/job/salt-models/tests.yml
+++ b/jenkins/client/job/salt-models/tests.yml
@@ -49,6 +49,9 @@
FORMULAS_SOURCE:
type: string
default: "{{formulas_src}}"
+ FORMULAS_REVISION:
+ type: string
+ default: "{{formulas_revision}}"
SYSTEM_GIT_URL:
type: string
default: ""
@@ -165,7 +168,10 @@
default: ""
FORMULAS_SOURCE:
type: string
- default: "{{formulas_src}}"
+ default: "pkg"
+ FORMULAS_REVISION:
+ type: string
+ default: "stable"
SYSTEM_GIT_URL:
type: string
default: ""