Merge "Fix for Pike/Queens Jobs"

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

diff --git a/jjb/natapp/natapp.yaml b/jjb/natapp/natapp.yaml
index a43775c654530ff6a314b3cd3c910c62ab2a00a2..5bffab7480d0849e7014a99e2589fc62631d4f66 100644 (file)
--- a/jjb/natapp/natapp.yaml
+++ b/jjb/natapp/natapp.yaml
@@ -1,26 +1,38 @@
 ---
+- project:
+    name: natapp-fluorine
+    jobs:
+      - '{project-name}-distribution-check-{stream}'
+      - '{project-name}-maven-javadoc-jobs'
+      - odl-maven-jobs
+
+    stream: fluorine
+    project: 'natapp'
+    project-name: 'natapp'
+    branch: 'master'
+    mvn-settings: 'natapp-settings'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    dependencies: 'openflowplugin-merge-{stream}'
+    email-upstream: '[natapp] [openflowplugin]'
+
+    # Used by the release job
+    staging-profile-id: a679c0f4f08a8
+
 - project:
     name: natapp-oxygen
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
       - '{project-name}-maven-javadoc-jobs'
       - odl-maven-jobs
 
     stream: oxygen
     project: 'natapp'
     project-name: 'natapp'
-    branch: 'master'
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
+    branch: 'stable/oxygen'
     mvn-settings: 'natapp-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: 'openflowplugin-merge-{stream}'
     email-upstream: '[natapp] [openflowplugin]'
-    archive-artifacts: ''
 
     # Used by the release job
     staging-profile-id: a679c0f4f08a8
@@ -29,7 +41,6 @@
     name: natapp-nitrogen
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
       - '{project-name}-maven-javadoc-jobs'
       - odl-maven-jobs
 
@@ -37,16 +48,10 @@
     project: 'natapp'
     project-name: 'natapp'
     branch: 'stable/nitrogen'
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
     mvn-settings: 'natapp-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: 'openflowplugin-merge-{stream}'
     email-upstream: '[natapp] [openflowplugin]'
-    archive-artifacts: ''
 
     # Used by the release job
     staging-profile-id: a679c0f4f08a8
@@ -55,7 +60,6 @@
     name: natapp-carbon
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
       - '{project-name}-maven-javadoc-jobs'
       - odl-maven-jobs
 
@@ -64,16 +68,10 @@
     project-name: 'natapp'
     branch: 'stable/carbon'
     karaf-version: karaf3
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
     mvn-settings: 'natapp-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: 'openflowplugin-merge-{stream}'
     email-upstream: '[natapp] [openflowplugin]'
-    archive-artifacts: ''
 
     # Used by the release job
     staging-profile-id: a679c0f4f08a8