X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fnatapp%2Fnatapp.yaml;h=c37bcce61334647bf9839f91c10485421e278643;hb=b4cf45c2f7b0f81a395a81f85718df294868429d;hp=f2c425a5e3c67270fc66a4fd116676a4064b937b;hpb=6b3088f6c4e6a138fa4405fb5c338013733776c3;p=releng%2Fbuilder.git

diff --git a/jjb/natapp/natapp.yaml b/jjb/natapp/natapp.yaml
index f2c425a5e..c37bcce61 100644
--- a/jjb/natapp/natapp.yaml
+++ b/jjb/natapp/natapp.yaml
@@ -1,85 +1,37 @@
 ---
 - project:
-    name: natapp-oxygen
+    name: natapp-fluorine
     jobs:
-      - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
       - '{project-name}-maven-javadoc-jobs'
-      - '{project-name}-merge-{stream}'
+      - odl-maven-jobs
 
-    stream: oxygen
+    stream: fluorine
     project: 'natapp'
     project-name: 'natapp'
     branch: 'master'
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
     mvn-settings: 'natapp-settings'
-    mvn-goals: 'clean install'
     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-jobs'
-      - '{project-name}-maven-javadoc-jobs'
-      - '{project-name}-merge-{stream}'
-
-    stream: nitrogen
-    project: 'natapp'
-    project-name: 'natapp'
-    branch: 'stable/nitrogen'
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
-    mvn-settings: 'natapp-settings'
-    mvn-goals: 'clean install'
-    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-jobs'
       - '{project-name}-maven-javadoc-jobs'
-      - '{project-name}-merge-{stream}'
+      - odl-maven-jobs
 
-    stream: carbon
+    stream: oxygen
     project: 'natapp'
     project-name: 'natapp'
-    branch: 'stable/carbon'
-    karaf-version: karaf3
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
+    branch: 'stable/oxygen'
     mvn-settings: 'natapp-settings'
-    mvn-goals: 'clean install'
     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
@@ -87,10 +39,15 @@
 - project:
     name: natapp-sonar
     jobs:
-      - '{project-name}-sonar'
+      - gerrit-maven-sonar
     project: 'natapp'
     project-name: 'natapp'
     branch: 'master'
     mvn-settings: 'natapp-settings'
-    mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+
+- view:
+    name: natapp
+    description: 'List of natapp jobs'
+    regex: '^natapp-.*'
+    <<: *releng_view_common