X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fnatapp%2Fnatapp.yaml;h=d8c10e852609fe6c0c6c94549fc77abc5e770ca5;hb=9d926f94fe3824189d4990b904c1807602ba7d85;hp=8530d9a7c41a045e590a298508abb0e4f6ab79e9;hpb=a578f1da030711f30d1927c0764eaed60e6b0fff;p=releng%2Fbuilder.git

diff --git a/jjb/natapp/natapp.yaml b/jjb/natapp/natapp.yaml
index 8530d9a7c..ce0ca72cd 100644
--- a/jjb/natapp/natapp.yaml
+++ b/jjb/natapp/natapp.yaml
@@ -1,45 +1,71 @@
-# ODL Releng build templates
+---
 - project:
-    name: natapp-boron
+    name: natapp-oxygen
     jobs:
-        - '{project-name}-clm-{stream}'
-        - '{project-name}-distribution-{stream}'
-        - '{project-name}-distribution-check-{stream}'
-        - '{project-name}-integration-{stream}'
-        - '{project-name}-merge-{stream}'
-        - '{project-name}-periodic-{stream}'
-        - '{project-name}-validate-autorelease-{stream}'
-        - '{project-name}-verify-{stream}-{maven}-{jdks}'
-
-    # stream:    release stream (eg. stable-lithium or beryllium)
-    # branch:    git branch (eg. stable/lithium or master)
-    stream:
-        - boron:
-            disable_autorelease: False
-            disable_distribution_check: False
+      - '{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'
-    jdk: openjdk8
-    jdks:
-        - openjdk8
-    maven:
-        - mvn33:
-            mvn-version: '{mvn33}'
     mvn-settings: 'natapp-settings'
-    mvn-goals: 'clean install -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r '
     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]'
+
+    # Used by the release job
+    staging-profile-id: a679c0f4f08a8
+
+- project:
+    name: natapp-carbon
+    jobs:
+      - '{project-name}-distribution-check-{stream}'
+      - '{project-name}-integration-{stream}'
+      - '{project-name}-maven-javadoc-jobs'
+      - odl-maven-jobs
+
+    stream: carbon
+    project: 'natapp'
+    project-name: 'natapp'
+    branch: 'stable/carbon'
+    karaf-version: karaf3
+    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-sonar
     jobs:
-        - '{project-name}-sonar'
+      - gerrit-maven-sonar
     project: 'natapp'
     project-name: 'natapp'
     branch: 'master'
     mvn-settings: 'natapp-settings'
-    mvn-goals: 'clean install -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r '
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'