From 74fba4f3b8cfd8f565b37255bbe3ed95c59600c9 Mon Sep 17 00:00:00 2001
From: Thanh Ha <thanh.ha@linuxfoundation.org>
Date: Mon, 6 Nov 2017 12:54:47 -0500
Subject: [PATCH] Migrate of-config 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: I2ec0c20da2f75f606f68c6f29c9d2c4ad01e38d1
Signed-off-by: Thanh Ha <thanh.ha@linuxfoundation.org>
---
 jjb/of-config/of-config.yaml | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

diff --git a/jjb/of-config/of-config.yaml b/jjb/of-config/of-config.yaml
index 7eaa59e77..465e54c59 100644
--- a/jjb/of-config/of-config.yaml
+++ b/jjb/of-config/of-config.yaml
@@ -2,12 +2,10 @@
 - project:
     name: of-config-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: 'of-config'
@@ -25,14 +23,16 @@
     email-upstream: '[of-config] [netconf]'
     archive-artifacts: ''
 
+    # Used by the release job
+    staging-profile-id: a6880455efe67
+
 - project:
     name: of-config-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: 'of-config'
@@ -50,14 +50,16 @@
     email-upstream: '[of-config] [netconf]'
     archive-artifacts: ''
 
+    # Used by the release job
+    staging-profile-id: a6880455efe67
+
 - project:
     name: of-config-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: 'of-config'
@@ -76,6 +78,9 @@
     email-upstream: '[of-config] [netconf]'
     archive-artifacts: ''
 
+    # Used by the release job
+    staging-profile-id: a6880455efe67
+
 - project:
     name: of-config-sonar
     jobs:
-- 
2.36.6