Migrate nic 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: Id2e0f5e1192ee402f331d3007afc76ef982c683b
Signed-off-by: Thanh Ha <thanh.ha@linuxfoundation.org>

diff --git a/jjb/nic/nic.yaml b/jjb/nic/nic.yaml
index 0573c3760f86c2875cdd6ef3097bc44a691747d4..b4aa09aabc2a6ccec9204e3d81fde0dc3ee20c58 100644 (file)
--- a/jjb/nic/nic.yaml
+++ b/jjb/nic/nic.yaml
@@ -2,12 +2,10 @@
 - project:
     name: nic-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: 'nic'
@@ -25,14 +23,16 @@
     email-upstream: '[nic] [vtn] [groupbasedpolicy]'
     archive-artifacts: ''
 
+    # Used by the release job
+    staging-profile-id: a67ef386204aa
+
 - project:
     name: nic-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: 'nic'
@@ -50,14 +50,16 @@
     email-upstream: '[nic] [vtn] [groupbasedpolicy]'
     archive-artifacts: ''
 
+    # Used by the release job
+    staging-profile-id: a67ef386204aa
+
 - project:
     name: nic-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: 'nic'
@@ -76,6 +78,9 @@
     email-upstream: '[nic] [vtn] [groupbasedpolicy]'
     archive-artifacts: ''
 
+    # Used by the release job
+    staging-profile-id: a67ef386204aa
+
 - project:
     name: nic-sonar
     jobs: