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

diff --git a/jjb/natapp/natapp.yaml b/jjb/natapp/natapp.yaml
index f08601eb8a74f128e5160e29ae5037ed2bbeb9ce..f2c425a5e3c67270fc66a4fd116676a4064b937b 100644 (file)
--- a/jjb/natapp/natapp.yaml
+++ b/jjb/natapp/natapp.yaml
@@ -2,11 +2,11 @@
 - project:
     name: natapp-oxygen
     jobs:
-      - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
+      - '{project-name}-maven-jobs'
+      - '{project-name}-maven-javadoc-jobs'
       - '{project-name}-merge-{stream}'
-      - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
     stream: oxygen
     project: 'natapp'
@@ -24,14 +24,17 @@
     email-upstream: '[natapp] [openflowplugin]'
     archive-artifacts: ''
 
+    # Used by the release job
+    staging-profile-id: a679c0f4f08a8
+
 - project:
     name: natapp-nitrogen
     jobs:
-      - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
+      - '{project-name}-maven-jobs'
+      - '{project-name}-maven-javadoc-jobs'
       - '{project-name}-merge-{stream}'
-      - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
     stream: nitrogen
     project: 'natapp'
@@ -49,14 +52,17 @@
     email-upstream: '[natapp] [openflowplugin]'
     archive-artifacts: ''
 
+    # Used by the release job
+    staging-profile-id: a679c0f4f08a8
+
 - project:
     name: natapp-carbon
     jobs:
-      - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
+      - '{project-name}-maven-jobs'
+      - '{project-name}-maven-javadoc-jobs'
       - '{project-name}-merge-{stream}'
-      - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
     stream: carbon
     project: 'natapp'
@@ -75,6 +81,9 @@
     email-upstream: '[natapp] [openflowplugin]'
     archive-artifacts: ''
 
+    # Used by the release job
+    staging-profile-id: a679c0f4f08a8
+
 - project:
     name: natapp-sonar
     jobs: