From bc17307063bec5f6ac69518dc11a796f17d208b4 Mon Sep 17 00:00:00 2001
From: Thanh Ha <thanh.ha@linuxfoundation.org>
Date: Mon, 6 Nov 2017 13:39:39 -0500
Subject: [PATCH] Migrate vtn to global-jjb Maven jobs

In an effort to consolidate our templates across projects we've migrated
several of our Maven jobs to global-jjb project. This patch updates the
project to use the global-jjb version of the same jobs.

Issue: RELENG-347
Change-Id: I52960a8418395f127e25a80c959a12faaa9ee259
Signed-off-by: Thanh Ha <thanh.ha@linuxfoundation.org>
---
 jjb/vtn/vtn.yaml | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

diff --git a/jjb/vtn/vtn.yaml b/jjb/vtn/vtn.yaml
index 86fd79dd8..3ec5bb43f 100644
--- a/jjb/vtn/vtn.yaml
+++ b/jjb/vtn/vtn.yaml
@@ -2,13 +2,11 @@
 - project:
     name: vtn-oxygen
     jobs:
-      - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
+      - '{project-name}-maven-jobs'
       - '{project-name}-maven-javadoc-jobs'
       - '{project-name}-merge-{stream}'
-      - '{project-name}-verify-{stream}-{maven}-{jdks}'
-      - gerrit-maven-verify-dependencies
 
     stream: oxygen
     project: 'vtn'
@@ -30,15 +28,17 @@
     # https://nexus.opendaylight.org/content/sites/site/
     archive-artifacts: 'manager/dist/*/target/*.zip coordinator/dist/target/*.bz2'
 
+    # Used by the release job
+    staging-profile-id: a699799dd6fc9
+
 - project:
     name: vtn-nitrogen
     jobs:
-      - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
+      - '{project-name}-maven-jobs'
       - '{project-name}-maven-javadoc-jobs'
       - '{project-name}-merge-{stream}'
-      - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
     stream: nitrogen
     project: 'vtn'
@@ -60,15 +60,17 @@
     # https://nexus.opendaylight.org/content/sites/site/
     archive-artifacts: 'manager/dist/*/target/*.zip coordinator/dist/target/*.bz2'
 
+    # Used by the release job
+    staging-profile-id: a699799dd6fc9
+
 - project:
     name: vtn-carbon
     jobs:
-      - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
+      - '{project-name}-maven-jobs'
       - '{project-name}-maven-javadoc-jobs'
       - '{project-name}-merge-{stream}'
-      - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
     stream: carbon
     project: 'vtn'
@@ -91,6 +93,9 @@
     # https://nexus.opendaylight.org/content/sites/site/
     archive-artifacts: 'manager/dist/*/target/*.zip coordinator/dist/target/*.bz2'
 
+    # Used by the release job
+    staging-profile-id: a699799dd6fc9
+
 - project:
     name: vtn-sonar
     jobs:
-- 
2.36.6