Revert "Enable only 1 merge job for a release"

This reverts commit 247134c09e5c42d5ad63d2e57e0561ec4ea14c46.
due to number of issues it introduces.
Issues were described in https://gerrit.fd.io/r/#/c/4793/ comments

Change-Id: I0f9ea82d98bbf2242cf516eeedf91d4330fb2858
Signed-off-by: Marek Gradzki <mgradzki@cisco.com>

diff --git a/jjb/hc2vpp/hc2vpp.yaml b/jjb/hc2vpp/hc2vpp.yaml
index 1fd9fda..a05117d 100644 (file)
--- a/jjb/hc2vpp/hc2vpp.yaml
+++ b/jjb/hc2vpp/hc2vpp.yaml
@@ -2,6 +2,7 @@
     name: hc2vpp
     jobs:
         - 'hc2vpp-verify-{stream}-{os}'
+        - 'hc2vpp-merge-{stream}-{os}'
         - 'hc2vpp-integration-{stream}-{os}'
         - 'hc2vpp-verify-image-{stream}-{os}'
     project: 'hc2vpp'
@@ -23,28 +24,6 @@
             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