Merge "Added RECLASS_VERSION param to test-customers-salt-models pipeline"
diff --git a/ceilometer/server/cluster.yml b/ceilometer/server/cluster.yml
index 11488fb..6f8d3f8 100644
--- a/ceilometer/server/cluster.yml
+++ b/ceilometer/server/cluster.yml
@@ -13,7 +13,7 @@
secret: ${_param:ceilometer_secret_key}
ttl: 86400
publisher:
- default:
+ default: {}
bind:
host: ${_param:cluster_local_address}
port: 8777
diff --git a/jenkins/client/job/deploy/update/cloud_update.yml b/jenkins/client/job/deploy/update/cloud_update.yml
index 02cf89d..8fc84ee 100644
--- a/jenkins/client/job/deploy/update/cloud_update.yml
+++ b/jenkins/client/job/deploy/update/cloud_update.yml
@@ -55,11 +55,11 @@
TARGET_ROLLBACKS:
type: string
default: ""
- description: "Comma separated list of nodes to update (Valid values are ctl,prx,msg,dbs,log,mon,mtr,ntw,nal,gtw-virtual,cmn,rgw,cmp,kvm,osd,gtw-physical)"
+ description: "Comma separated list of nodes to rollback (Valid values are ctl,prx,msg,dbs,log,mon,mtr,ntw,nal,gtw-virtual,cmn,rgw,cmp,kvm,osd,gtw-physical)"
TARGET_MERGES:
type: string
default: ""
- description: "Comma separated list of nodes to update (Valid values are cfg,ctl,prx,msg,dbs,log,mon,mtr,ntw,nal,gtw-virtual,cmn,rgw,cid)"
+ description: "Comma separated list of nodes to merge (Valid values are cfg,ctl,prx,msg,dbs,log,mon,mtr,ntw,nal,gtw-virtual,cmn,rgw,cid)"
CTL_TARGET:
type: string
default: "ctl*"
@@ -123,7 +123,7 @@
GTW_TARGET:
type: string
default: "gtw01*"
- description: "Salt targeted physical GTW nodes (ex. gtw01*)"
+ description: "Salt targeted physical or virtual GTW nodes (ex. gtw01*)"
REBOOT:
type: boolean
default: 'false'
@@ -131,15 +131,15 @@
ROLLBACK_PKG_VERSIONS:
type: string
default: ""
- description: "Space separated list of pkgs=versions to rollback to (ex. pkg_name1=pkg_version1 pkg_name2=pkg_version2)"
+ description: "Space separated list of pkgs=versions to rollback to on physical targeted machines (ex. pkg_name1=pkg_version1 pkg_name2=pkg_version2)"
PURGE_PKGS:
type: string
default: ""
- description: "Space separated list of pkgs=versions to be purged (ex. pkg_name1=pkg_version1 pkg_name2=pkg_version2)"
+ description: "Space separated list of pkgs=versions to be purged on physical targeted machines (ex. pkg_name1=pkg_version1 pkg_name2=pkg_version2)"
REMOVE_PKGS:
type: string
default: ""
- description: "Space separated list of pkgs=versions to be removed (ex. pkg_name1=pkg_version1 pkg_name2=pkg_version2)"
+ description: "Space separated list of pkgs=versions to be removed on physical targeted machines (ex. pkg_name1=pkg_version1 pkg_name2=pkg_version2)"
RESTORE_GALERA:
type: boolean
default: 'false'
diff --git a/jenkins/client/job/opencontrail/git-mirrors/upstream.yml b/jenkins/client/job/opencontrail/git-mirrors/upstream.yml
index af4c6ac..0f60c76 100644
--- a/jenkins/client/job/opencontrail/git-mirrors/upstream.yml
+++ b/jenkins/client/job/opencontrail/git-mirrors/upstream.yml
@@ -46,6 +46,8 @@
branches: ${_param:contrail_dpdk_extra_branches}
- name: contrail-dpdk
branches: ${_param:contrail_dpdk_branches}
+ - name: contrail-third-party-cache-fixup
+ branches: ${_param:contrail_third_party_cache_fixup_branches}
template:
discard:
build:
diff --git a/jenkins/client/job/opencontrail/init.yml b/jenkins/client/job/opencontrail/init.yml
index 34cc4e5..d2ecdb6 100644
--- a/jenkins/client/job/opencontrail/init.yml
+++ b/jenkins/client/job/opencontrail/init.yml
@@ -9,6 +9,7 @@
contrail_ceilometer_plugin_branches: "master,R4.0,R4.1"
contrail_kubernetes_branches: "master,origin-1.1,origin-1.1.3,release-1.1,release-1.2"
contrail_dpdk_branches: "master,R3.0.2.x,R3.0.3.x,R3.1,R3.1.1.x,R3.2,R3.2.3.x,R4.0,R4.0.1,R4.1,contrail_dpdk_17_02,contrail_dpdk_17_05,contrail_dpdk_1_7,contrail_dpdk_2_0,contrail_dpdk_2_1"
+ contrail_third_party_cache_fixup_branches: "master"
jenkins:
client:
view: