From 19fc98738c41aa9e4853a2971361e7db5e8f9d53 Mon Sep 17 00:00:00 2001
From: Thanh Ha <thanh.ha@linuxfoundation.org>
Date: Mon, 6 Nov 2017 13:12:23 -0500
Subject: [PATCH] Migrate reservation 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: Id67dfa65d23084fe15a4fb2c9b8f678d73b6aad9
Signed-off-by: Thanh Ha <thanh.ha@linuxfoundation.org>
---
 jjb/reservation/reservation.yaml | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/jjb/reservation/reservation.yaml b/jjb/reservation/reservation.yaml
index c9a2bb4399..c57615dfc0 100644
--- a/jjb/reservation/reservation.yaml
+++ b/jjb/reservation/reservation.yaml
@@ -2,10 +2,9 @@
 - project:
     name: reservation-oxygen
     jobs:
-      - '{project-name}-clm-{stream}'
       - '{project-name}-integration-{stream}'
+      - '{project-name}-maven-jobs'
       - '{project-name}-merge-{stream}'
-      - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
     stream: oxygen
     project: 'reservation'
@@ -23,13 +22,15 @@
     email-upstream: '[reservation]'
     archive-artifacts: ''
 
+    # Used by the release job
+    staging-profile-id: a68d9bc504037
+
 - project:
     name: reservation-nitrogen
     jobs:
-      - '{project-name}-clm-{stream}'
       - '{project-name}-integration-{stream}'
+      - '{project-name}-maven-jobs'
       - '{project-name}-merge-{stream}'
-      - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
     stream: nitrogen
     project: 'reservation'
@@ -47,13 +48,15 @@
     email-upstream: '[reservation]'
     archive-artifacts: ''
 
+    # Used by the release job
+    staging-profile-id: a68d9bc504037
+
 - project:
     name: reservation-carbon
     jobs:
-      - '{project-name}-clm-{stream}'
       - '{project-name}-integration-{stream}'
+      - '{project-name}-maven-jobs'
       - '{project-name}-merge-{stream}'
-      - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
     stream: carbon
     project: 'reservation'
@@ -72,6 +75,9 @@
     email-upstream: '[reservation]'
     archive-artifacts: ''
 
+    # Used by the release job
+    staging-profile-id: a68d9bc504037
+
 - project:
     name: reservation-sonar
     jobs:
-- 
2.36.6