X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fnatapp%2Fnatapp.yaml;h=f42bc0c8a1dcb255eb2539a09f00b47056aa5fab;hb=f9339d2274fe3e2f8249bc2396c1f869435f9270;hp=b40529213b487f29ccf266b67718476a1b667c60;hpb=39a0450315a14058a0c8fd7eb8c53fad2637249f;p=releng%2Fbuilder.git

diff --git a/jjb/natapp/natapp.yaml b/jjb/natapp/natapp.yaml
index b40529213..f42bc0c8a 100644
--- a/jjb/natapp/natapp.yaml
+++ b/jjb/natapp/natapp.yaml
@@ -1,13 +1,11 @@
 ---
 - project:
-    name: natapp-oxygen
+    name: natapp-fluorine
     jobs:
-      - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
       - '{project-name}-maven-javadoc-jobs'
       - odl-maven-jobs
 
-    stream: oxygen
+    stream: fluorine
     project: 'natapp'
     project-name: 'natapp'
     branch: 'master'
@@ -15,50 +13,25 @@
     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
 
 - project:
-    name: natapp-nitrogen
-    jobs:
-      - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-javadoc-jobs'
-      - odl-maven-jobs
-
-    stream: nitrogen
-    project: 'natapp'
-    project-name: 'natapp'
-    branch: 'stable/nitrogen'
-    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
-
-- project:
-    name: natapp-carbon
+    name: natapp-oxygen
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
       - '{project-name}-maven-javadoc-jobs'
       - odl-maven-jobs
 
-    stream: carbon
+    stream: oxygen
     project: 'natapp'
     project-name: 'natapp'
-    branch: 'stable/carbon'
-    karaf-version: karaf3
+    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