Merge "Keep more builds for tests"
diff --git a/heka/log_collector/output/sensu.yml b/heka/log_collector/output/sensu.yml
index e7bf79d..23085b7 100644
--- a/heka/log_collector/output/sensu.yml
+++ b/heka/log_collector/output/sensu.yml
@@ -1,3 +1,2 @@
classes:
- service.heka.log_collector.output.sensu
-
diff --git a/heka/log_collector/output/telegraf.yml b/heka/log_collector/output/telegraf.yml
new file mode 100644
index 0000000..94171cb
--- /dev/null
+++ b/heka/log_collector/output/telegraf.yml
@@ -0,0 +1,8 @@
+parameters:
+ _param:
+ log_collector_telegraf_port: 8186
+ heka:
+ log_collector:
+ telegraf_host: 127.0.0.1
+ telegraf_port: ${_param:log_collector_telegraf_port}
+ telegraf_timeout: 2000
diff --git a/heka/remote_collector/output/telegraf.yml b/heka/remote_collector/output/telegraf.yml
new file mode 100644
index 0000000..7f7a5c0
--- /dev/null
+++ b/heka/remote_collector/output/telegraf.yml
@@ -0,0 +1,8 @@
+parameters:
+ _param:
+ remote_collector_telegraf_port: 8186
+ heka:
+ remote_collector:
+ influxdb_host: ${_param:remote_collector_telegraf_host}
+ influxdb_port: ${_param:remote_collector_telegraf_port}
+ influxdb_timeout: 2000
diff --git a/jenkins/client/job/deploy/lab/mk/cleanup.yml b/jenkins/client/job/deploy/lab/mk/cleanup.yml
index a400842..626dd4e 100644
--- a/jenkins/client/job/deploy/lab/mk/cleanup.yml
+++ b/jenkins/client/job/deploy/lab/mk/cleanup.yml
@@ -29,19 +29,19 @@
# heat parameters
OPENSTACK_API_URL:
type: string
- default: "https://vpc.tcpisek.cz:5000"
+ default: "https://cloud-cz.bud.mirantis.net:5000"
OPENSTACK_API_CREDENTIALS:
type: string
- default: "openstack-qa-credentials"
+ default: "openstack-devcloud-credentials"
OPENSTACK_API_PROJECT:
type: string
- default: "mirantis_mk20_qa"
+ default: "mcp-mk"
OPENSTACK_API_CLIENT:
type: string
- default: "liberty"
+ default: ""
OPENSTACK_API_VERSION:
type: string
- default: "2"
+ default: "3"
OPENSTACK_API_PROJECT_DOMAIN:
type: string
default: "default"
@@ -79,19 +79,19 @@
# openstack api
OPENSTACK_API_URL:
type: string
- default: "https://vpc.tcpisek.cz:5000"
+ default: "https://cloud-cz.bud.mirantis.net:5000"
OPENSTACK_API_CREDENTIALS:
type: string
- default: "openstack-qa-credentials"
+ default: "openstack-devcloud-credentials"
OPENSTACK_API_PROJECT:
type: string
- default: "mirantis_mk20_qa"
+ default: "mcp-mk"
OPENSTACK_API_CLIENT:
type: string
- default: "liberty"
+ default: ""
OPENSTACK_API_VERSION:
type: string
- default: "2"
+ default: "3"
OPENSTACK_API_PROJECT_DOMAIN:
type: string
default: "default"
diff --git a/jenkins/client/job/deploy/lab/mk/cloud.yml b/jenkins/client/job/deploy/lab/mk/cloud.yml
index a79414b..7461acf 100644
--- a/jenkins/client/job/deploy/lab/mk/cloud.yml
+++ b/jenkins/client/job/deploy/lab/mk/cloud.yml
@@ -99,16 +99,16 @@
# openstack api
OPENSTACK_API_URL:
type: string
- default: "https://vpc.tcpisek.cz:5000"
+ default: "https://cloud-cz.bud.mirantis.net:5000"
OPENSTACK_API_CREDENTIALS:
type: string
- default: "openstack-qa-credentials"
+ default: "openstack-devcloud-credentials"
OPENSTACK_API_PROJECT:
type: string
- default: "mirantis_mk20_qa"
+ default: "mcp-mk"
OPENSTACK_API_CLIENT:
type: string
- default: "liberty"
+ default: ""
OPENSTACK_API_VERSION:
type: string
default: "2"
@@ -128,13 +128,13 @@
# heat
HEAT_STACK_ENVIRONMENT:
type: string
- default: "tcpisek"
+ default: "devcloud"
HEAT_STACK_ZONE:
type: string
- default: "workshop-sunnyvale"
+ default: "mcp-mk"
HEAT_STACK_PUBLIC_NET:
type: string
- default: "mirantis-private"
+ default: "public"
# k8s setttings
K8S_API_SERVER:
diff --git a/jenkins/client/job/deploy/lab/mk/init.yml b/jenkins/client/job/deploy/lab/mk/init.yml
index 1ddd863..dde1fb0 100644
--- a/jenkins/client/job/deploy/lab/mk/init.yml
+++ b/jenkins/client/job/deploy/lab/mk/init.yml
@@ -62,13 +62,13 @@
# heat
HEAT_STACK_ENVIRONMENT:
type: string
- default: "tcpisek"
+ default: "devcloud"
HEAT_STACK_ZONE:
type: string
- default: "mirantis-zone-qa"
+ default: "mcp-mk"
HEAT_STACK_PUBLIC_NET:
type: string
- default: "mirantis-private"
+ default: "public"
# salt master
SALT_MASTER_CREDENTIALS:
@@ -81,19 +81,19 @@
# openstack api
OPENSTACK_API_URL:
type: string
- default: "https://vpc.tcpisek.cz:5000"
+ default: "https://cloud-cz.bud.mirantis.net:5000"
OPENSTACK_API_CREDENTIALS:
type: string
- default: "openstack-qa-credentials"
+ default: "openstack-devcloud-credentials"
OPENSTACK_API_PROJECT:
type: string
- default: "mirantis_mk20_qa"
+ default: "mcp-mk"
OPENSTACK_API_CLIENT:
type: string
- default: "liberty"
+ default: ""
OPENSTACK_API_VERSION:
type: string
- default: "2"
+ default: "3"
OPENSTACK_API_PROJECT_DOMAIN:
type: string
default: "default"
diff --git a/jenkins/client/job/opencontrail/build/test.yml b/jenkins/client/job/opencontrail/build/test.yml
index 9b66e60..0d1f7bf 100644
--- a/jenkins/client/job/opencontrail/build/test.yml
+++ b/jenkins/client/job/opencontrail/build/test.yml
@@ -63,11 +63,8 @@
- "{{branch}}"
event:
comment:
- - added:
- verdictCategory: 'Code-Review'
- commentAddedTriggerApprovalValue: '+1'
- addedContains:
- commentAddedCommentContains: '(recheck|reverify)'
+ commentAddedCommentContains: "^(test|recheck|reverify)$"
param:
TEST_MODELS:
type: string
diff --git a/jenkins/client/job/salt-formulas/tests.yml b/jenkins/client/job/salt-formulas/tests.yml
index 60f4f3f..a1147e7 100644
--- a/jenkins/client/job/salt-formulas/tests.yml
+++ b/jenkins/client/job/salt-formulas/tests.yml
@@ -135,11 +135,8 @@
- master
event:
comment:
- - added:
- verdictCategory: 'Code-Review'
- commentAddedTriggerApprovalValue: '+1'
- addedContains:
- commentAddedCommentContains: '(recheck|reverify)'
+ commentAddedCommentContains: "^(test|recheck|reverify)$"
param:
SALT_VERSION:
type: string
diff --git a/jenkins/client/job/salt-models/tests.yml b/jenkins/client/job/salt-models/tests.yml
index 3eec219..6554fc5 100644
--- a/jenkins/client/job/salt-models/tests.yml
+++ b/jenkins/client/job/salt-models/tests.yml
@@ -23,11 +23,8 @@
name: "{{branch}}"
event:
comment:
- - added:
- verdictCategory: 'Code-Review'
- commentAddedTriggerApprovalValue: '+1'
- addedContains:
- commentAddedCommentContains: '(recheck|reverify)'
+ commentAddedCommentContains: "^(test|recheck|reverify)$"
param:
SALT_OPTS:
type: string
@@ -108,11 +105,8 @@
- master
event:
comment:
- - added:
- verdictCategory: 'CodeReview'
- commentAddedTriggerApprovalValue: '+1'
- addedContains:
- commentAddedCommentContains: '(recheck|reverify)'
+ commentAddedCommentContains: "^(test|recheck|reverify)$"
param:
COOKIECUTTER_TEMPLATE_URL:
type: string
diff --git a/linux/system/repo_local/mcp/extra.yml b/linux/system/repo_local/mcp/extra.yml
index b7ae91a..c55ecfc 100644
--- a/linux/system/repo_local/mcp/extra.yml
+++ b/linux/system/repo_local/mcp/extra.yml
@@ -10,3 +10,8 @@
source: "deb [arch=amd64] http://${_param:local_repo_url}/ubuntu-${_param:linux_system_codename}/ ${_param:linux_system_repo_mcp_extra_version} extra"
architectures: amd64
key_url: "http://${_param:local_repo_url}/public.gpg"
+ clean_file: true
+ pin:
+ - pin: 'release a=${_param:linux_system_repo_mcp_extra_version}'
+ priority: 1100
+ package: '*'