X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fodlparent%2Fodlparent.yaml;h=11bbb7ba8f994ff7a604787e3d4a3fcb6c2c467d;hb=3db1010a1acc7ec4f4cd9ca4d4171b733fe8091b;hp=6c49ed8dd8b8576eea6f6810c98cc2287edcfc48;hpb=fcaa90e38fd2ed28e0131fc95b4148680ee6857f;p=releng%2Fbuilder.git

diff --git a/jjb/odlparent/odlparent.yaml b/jjb/odlparent/odlparent.yaml
index 6c49ed8dd..11bbb7ba8 100644
--- a/jjb/odlparent/odlparent.yaml
+++ b/jjb/odlparent/odlparent.yaml
@@ -1,6 +1,6 @@
 ---
 - project:
-    name: odlparent-carbon
+    name: odlparent-nitrogen
     jobs:
       - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
@@ -8,8 +8,10 @@
       - '{project-name}-merge-{stream}'
       - '{project-name}-validate-autorelease-{stream}'
       - '{project-name}-verify-{stream}-{maven}-{jdks}'
+      - '{project-name}-verify-tox-{stream}'
+      - '{project-name}-maven-jobs'
 
-    stream: carbon
+    stream: nitrogen
     project: 'odlparent'
     project-name: 'odlparent'
     branch: 'master'
@@ -18,16 +20,21 @@
       - openjdk8
     maven:
       - mvn33:
-          mvn-version: 'mvn33'
+          mvn-version: mvn33
     mvn-settings: 'odlparent-settings'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    mvn-version: mvn33
     dependencies: ''
     email-upstream: '[odlparent]'
     archive-artifacts: ''
 
+    # Used by the release job
+    settings-file: odlparent-settings
+    staging-profile-id: 880d5ac25eaa
+
 - project:
-    name: odlparent-boron
+    name: odlparent-carbon
     jobs:
       - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
@@ -35,11 +42,13 @@
       - '{project-name}-merge-{stream}'
       - '{project-name}-validate-autorelease-{stream}'
       - '{project-name}-verify-{stream}-{maven}-{jdks}'
+      - '{project-name}-verify-tox-{stream}'
 
-    stream: boron
+    stream: carbon
     project: 'odlparent'
     project-name: 'odlparent'
-    branch: 'stable/boron'
+    branch: 'stable/carbon'
+    karaf-version: karaf3
     jdk: openjdk8
     jdks:
       - openjdk8
@@ -54,7 +63,7 @@
     archive-artifacts: ''
 
 - project:
-    name: odlparent-beryllium
+    name: odlparent-boron
     jobs:
       - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
@@ -63,13 +72,13 @@
       - '{project-name}-validate-autorelease-{stream}'
       - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
-    stream: beryllium
+    stream: boron
     project: 'odlparent'
     project-name: 'odlparent'
-    branch: 'stable/beryllium'
-    jdk: openjdk7
+    branch: 'stable/boron'
+    karaf-version: karaf3
+    jdk: openjdk8
     jdks:
-      - openjdk7
       - openjdk8
     maven:
       - mvn33: