From 0b3cfe376ef53ab4286e4ecc9d8ce56b7164b95d Mon Sep 17 00:00:00 2001
From: Thanh Ha <thanh.ha@linuxfoundation.org>
Date: Tue, 31 Oct 2017 12:48:06 -0400
Subject: [PATCH] Migrate honeycomb-vbd 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: I12cd51e1ce675c51699b39918f3a3ff4cee35127
Signed-off-by: Thanh Ha <thanh.ha@linuxfoundation.org>
---
 jjb/honeycomb/vbd/vbd.yaml | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

diff --git a/jjb/honeycomb/vbd/vbd.yaml b/jjb/honeycomb/vbd/vbd.yaml
index 7912a13806..59a0c61460 100644
--- a/jjb/honeycomb/vbd/vbd.yaml
+++ b/jjb/honeycomb/vbd/vbd.yaml
@@ -2,12 +2,10 @@
 - project:
     name: vbd-oxygen
     jobs:
-      - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
+      - '{project-name}-maven-jobs'
       - '{project-name}-merge-{stream}'
-      - '{project-name}-verify-{stream}-{maven}-{jdks}'
-      - gerrit-maven-verify-dependencies
 
     stream: oxygen
     project: 'honeycomb/vbd'
@@ -25,14 +23,16 @@
     email-upstream: '[vbd]'
     archive-artifacts: ''
 
+    # Used by the release job
+    staging-profile-id: 96fc362c36862
+
 - project:
     name: vbd-nitrogen
     jobs:
-      - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
+      - '{project-name}-maven-jobs'
       - '{project-name}-merge-{stream}'
-      - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
     stream: nitrogen
     project: 'honeycomb/vbd'
@@ -50,14 +50,16 @@
     email-upstream: '[vbd]'
     archive-artifacts: ''
 
+    # Used by the release job
+    staging-profile-id: 96fc362c36862
+
 - project:
     name: vbd-carbon
     jobs:
-      - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
+      - '{project-name}-maven-jobs'
       - '{project-name}-merge-{stream}'
-      - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
     stream: carbon
     project: 'honeycomb/vbd'
@@ -76,6 +78,9 @@
     email-upstream: '[vbd]'
     archive-artifacts: ''
 
+    # Used by the release job
+    staging-profile-id: 96fc362c36862
+
 - project:
     name: vbd-sonar
     jobs:
-- 
2.36.6