From 247134c09e5c42d5ad63d2e57e0561ec4ea14c46 Mon Sep 17 00:00:00 2001
From: Thanh Ha <thanh.ha@linuxfoundation.org>
Date: Thu, 19 Jan 2017 15:13:08 -0500
Subject: [PATCH 1/1] Enable only 1 merge job for a release

Change-Id: Ie493df45ec67d92bbc6724ebe92f75b280bb571f
Signed-off-by: Thanh Ha <thanh.ha@linuxfoundation.org>
---
 jjb/hc2vpp/hc2vpp.yaml | 23 ++++++++++++++++++++++-
 1 file changed, 22 insertions(+), 1 deletion(-)

diff --git a/jjb/hc2vpp/hc2vpp.yaml b/jjb/hc2vpp/hc2vpp.yaml
index a05117d3c..1fd9fdaba 100644
--- a/jjb/hc2vpp/hc2vpp.yaml
+++ b/jjb/hc2vpp/hc2vpp.yaml
@@ -2,7 +2,6 @@
     name: hc2vpp
     jobs:
         - 'hc2vpp-verify-{stream}-{os}'
-        - 'hc2vpp-merge-{stream}-{os}'
         - 'hc2vpp-integration-{stream}-{os}'
         - 'hc2vpp-verify-image-{stream}-{os}'
     project: 'hc2vpp'
@@ -24,6 +23,28 @@
             branch: 'stable/1701'
             repo-stream-part: 'stable.1701'
 
+- project:
+    # Only 1 merge job is possible to push artifacts so pick a preferred OS
+    # to prevent jobs from colliding with each other trying to push artifacts
+    # to Nexus.
+    name: hc2vpp-merge
+    jobs:
+        - 'hc2vpp-merge-{stream}-{os}'
+
+    project: 'hc2vpp'
+    os:
+        - ubuntu1604:
+            repo-os-part: 'ubuntu.xenial.main'
+            skip-site: 'true'
+
+    stream:
+        - master:
+            branch: 'master'
+            repo-stream-part: 'master'
+        - '1701':
+            branch: 'stable/1701'
+            repo-stream-part: 'stable.1701'
+
 - job-template:
     name: 'hc2vpp-verify-{stream}-{os}'
     project-type: maven
-- 
2.16.6