Merge "Migrate sfc to global-jjb Maven jobs"

[releng/builder.git] / jjb / natapp / natapp.yaml

diff --git a/jjb/natapp/natapp.yaml b/jjb/natapp/natapp.yaml
index 68b25c20ad687fd53bdb0039a971f25c2feb3007..f2c425a5e3c67270fc66a4fd116676a4064b937b 100644 (file)
--- a/jjb/natapp/natapp.yaml
+++ b/jjb/natapp/natapp.yaml
@@ -2,17 +2,16 @@
 - 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'
     project-name: 'natapp'
     branch: 'master'
-    jdk: openjdk8
     jdks:
       - openjdk8
     maven:
@@ -25,20 +24,22 @@
     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'
     project-name: 'natapp'
     branch: 'stable/nitrogen'
-    jdk: openjdk8
     jdks:
       - openjdk8
     maven:
@@ -51,21 +52,23 @@
     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'
     project-name: 'natapp'
     branch: 'stable/carbon'
     karaf-version: karaf3
-    jdk: openjdk8
     jdks:
       - openjdk8
     maven:
@@ -78,6 +81,9 @@
     email-upstream: '[natapp] [openflowplugin]'
     archive-artifacts: ''
 
+    # Used by the release job
+    staging-profile-id: a679c0f4f08a8
+
 - project:
     name: natapp-sonar
     jobs: