Fixed branches in contrail upstream mirror build
Change-Id: I2edbf7b62ea7b22d799bb3d1fca2c0c30e1c04c3
diff --git a/jenkins/client/job/opencontrail/git-mirrors/downstream.yml b/jenkins/client/job/opencontrail/git-mirrors/downstream.yml
index 0cf3a33..b49a1a0 100644
--- a/jenkins/client/job/opencontrail/git-mirrors/downstream.yml
+++ b/jenkins/client/job/opencontrail/git-mirrors/downstream.yml
@@ -8,24 +8,43 @@
name: git-mirror-{{name}}
jobs:
- name: contrail-build
+ branches: ${_param:contrail_branches}
- name: contrail-controller
+ branches: ${_param:contrail_branches}
- name: contrail-vrouter
+ branches: ${_param:contrail_branches}
- name: contrail-third-party
+ branches: ${_param:contrail_branches}
- name: contrail-generateDS
+ branches: ${_param:contrail_branches}
- name: contrail-sandesh
+ branches: ${_param:contrail_branches}
- name: contrail-packages
+ branches: ${_param:contrail_branches}
- name: contrail-nova-vif-driver
+ branches: ${_param:contrail_branches}
- name: contrail-neutron-plugin
+ branches: ${_param:contrail_branches}
- name: contrail-nova-extensions
+ branches: ${_param:contrail_branches}
- name: contrail-ceilometer-plugin
+ branches: ${_param:contrail_ceilometer_plugin_branches}
- name: contrail-heat
+ branches: ${_param:contrail_branches}
- name: contrail-web-storage
+ branches: ${_param:contrail_branches}
- name: contrail-web-server-manager
+ branches: ${_param:contrail_branches}
- name: contrail-web-controller
+ branches: ${_param:contrail_branches}
- name: contrail-web-core
+ branches: ${_param:contrail_branches}
- name: contrail-webui-third-party
+ branches: ${_param:contrail_branches}
- name: contrail-dpdk-extra-packages
+ branches: ${_param:contrail_dpdk_extra_branches}
- name: contrail-kubernetes
+ branches: ${_param:contrail_kubernetes_branches}
template:
discard:
build:
@@ -57,7 +76,7 @@
default: "gerrit"
BRANCHES:
type: string
- default: ${_param:contrail_branches}
+ default: "{{branches}}"
job:
git-mirror-ifmap-python-client:
discard:
diff --git a/jenkins/client/job/opencontrail/init.yml b/jenkins/client/job/opencontrail/init.yml
index b41a357..63e4215 100644
--- a/jenkins/client/job/opencontrail/init.yml
+++ b/jenkins/client/job/opencontrail/init.yml
@@ -7,6 +7,7 @@
contrail_kubernetes_branches: "master,release-1.2"
contrail_dpdk_extra_branches: "mitaka,kilo,liberty-multiqueue"
contrail_ceilometer_plugin_branches: "master"
+ contrail_kubernetes_branches: "master,origin-1.1,origin-1.1.3,release-1.1,release-1.2"
jenkins:
client:
view: