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

diff --git a/jjb/tsdr/tsdr.yaml b/jjb/tsdr/tsdr.yaml
index 9ccf6eb5e..011b887da 100644
--- a/jjb/tsdr/tsdr.yaml
+++ b/jjb/tsdr/tsdr.yaml
@@ -2,11 +2,10 @@
 - project:
     name: tsdr-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}'
 
     stream: oxygen
     project: 'tsdr'
@@ -24,14 +23,16 @@
     email-upstream: '[tsdr]'
     archive-artifacts: ''
 
+    # Used by the release job
+    staging-profile-id: a69373036303c
+
 - project:
     name: tsdr-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: 'tsdr'
@@ -49,14 +50,16 @@
     email-upstream: '[tsdr]'
     archive-artifacts: ''
 
+    # Used by the release job
+    staging-profile-id: a69373036303c
+
 - project:
     name: tsdr-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: 'tsdr'
@@ -75,6 +78,9 @@
     email-upstream: '[tsdr]'
     archive-artifacts: ''
 
+    # Used by the release job
+    staging-profile-id: a69373036303c
+
 - project:
     name: tsdr-sonar
     jobs:
-- 
2.36.6