X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fodlparent%2Fodlparent.yaml;h=620023578bf352874727fd8bb99deaf3cf1e494b;hb=8da0ea5b459eae1b2de8540a9d574cac8abdeb7e;hp=6e84bea1f63391a8bc07aa892620b3fa1a717a1f;hpb=552d73f1f359e6e35c68629e89a4940c2e8cba57;p=releng%2Fbuilder.git

diff --git a/jjb/odlparent/odlparent.yaml b/jjb/odlparent/odlparent.yaml
index 6e84bea1f..620023578 100644
--- a/jjb/odlparent/odlparent.yaml
+++ b/jjb/odlparent/odlparent.yaml
@@ -1,46 +1,89 @@
 ---
 - project:
-    name: odlparent-carbon
+    name: odlparent-master
     jobs:
       - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
       - '{project-name}-merge-{stream}'
-      - '{project-name}-validate-autorelease-{stream}'
       - '{project-name}-verify-{stream}-{maven}-{jdks}'
       - '{project-name}-verify-tox-{stream}'
+      - '{project-name}-maven-jobs'
+
+    project: odlparent
+    project-name: odlparent
+    stream: master
+    branch: master
+    distribution_branch: master
 
-    stream: carbon
-    project: 'odlparent'
-    project-name: 'odlparent'
-    branch: 'master'
     jdk: openjdk8
     jdks:
       - openjdk8
     maven:
       - mvn33:
-          mvn-version: 'mvn33'
-    mvn-settings: 'odlparent-settings'
-    mvn-goals: 'clean install'
+          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-2.0.x
+    jobs:
+      - '{project-name}-clm-{stream}'
+      - '{project-name}-distribution-check-{stream}'
+      - '{project-name}-merge-{stream}'
+      - '{project-name}-verify-{stream}-{maven}-{jdks}'
+      - '{project-name}-verify-tox-{stream}'
+      - '{project-name}-maven-jobs'
+
+    project: odlparent
+    project-name: odlparent
+    stream: 2.0.x
+    branch: 2.0.x
+    distribution_branch: master
+
+    jdk: openjdk8
+    jdks:
+      - openjdk8
+    maven:
+      - 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-carbon
     jobs:
       - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
       - '{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
@@ -55,22 +98,21 @@
     archive-artifacts: ''
 
 - project:
-    name: odlparent-beryllium
+    name: odlparent-boron
     jobs:
       - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
       - '{project-name}-merge-{stream}'
-      - '{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: