From 171eb327c007a331ea111ff98dc94a26a3704de2 Mon Sep 17 00:00:00 2001
From: Thanh Ha <thanh.ha@linuxfoundation.org>
Date: Mon, 30 Oct 2017 17:46:13 -0400
Subject: [PATCH] Migrate atrium 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: I3a09357fdabdc7bfbd2a28b41cd24ade92d6a256
Signed-off-by: Thanh Ha <thanh.ha@linuxfoundation.org>
---
 jjb/atrium/atrium.yaml | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

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