Merge "Fix typo in opencontrail 5 branches"
diff --git a/jenkins/client/job/opencontrail/git-mirrors/downstream.yml b/jenkins/client/job/opencontrail/git-mirrors/downstream.yml
index 792a48c..891c244 100644
--- a/jenkins/client/job/opencontrail/git-mirrors/downstream.yml
+++ b/jenkins/client/job/opencontrail/git-mirrors/downstream.yml
@@ -48,11 +48,11 @@
- name: contrail-dpdk
branches: ${_param:contrail_dpdk_branches}
- name: contrail-common
- branches: ${_param:oc5_new_contrail_branches}
+ branches: ${_param:oc5_branches}
- name: contrail-analytics
- branches: ${_param:oc5_new_contrail_branches}
+ branches: ${_param:oc5_branches}
- name: contrail-api-client
- branches: ${_param:oc5_new_contrail_branches}
+ branches: ${_param:oc5_branches}
template:
discard:
build:
diff --git a/jenkins/client/job/opencontrail/init.yml b/jenkins/client/job/opencontrail/init.yml
index 38610fd..2072808 100644
--- a/jenkins/client/job/opencontrail/init.yml
+++ b/jenkins/client/job/opencontrail/init.yml
@@ -5,7 +5,7 @@
_param:
contrail_branches: "R3.0.2.x,R3.0.3.x,R3.1,R3.1.1.x,R3.2,R3.2.3.x,R4.0,R4.1,R5.0,master"
# from OC50 there are new repos without older branches
- oc5_new_contrail_branches: "R5.0, master"
+ oc5_branches: "R5.0,master"
# generateDS does not have 5.0 branch
contrail_branches_generateDS: "R3.0.2.x,R3.0.3.x,R3.1,R3.1.1.x,R3.2,R3.2.3.x,R4.0,R4.1,master"
contrail_kubernetes_branches: "master,release-1.2"