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

diff --git a/jjb/odlparent/odlparent.yaml b/jjb/odlparent/odlparent.yaml
index 9f6453303..620023578 100644
--- a/jjb/odlparent/odlparent.yaml
+++ b/jjb/odlparent/odlparent.yaml
@@ -1,29 +1,66 @@
 ---
 - project:
-    name: odlparent-nitrogen
+    name: odlparent-master
     jobs:
       - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
       - '{project-name}-merge-{stream}'
       - '{project-name}-verify-{stream}-{maven}-{jdks}'
       - '{project-name}-verify-tox-{stream}'
       - '{project-name}-maven-jobs'
 
-    stream: nitrogen
-    project: 'odlparent'
-    project-name: 'odlparent'
-    branch: 'master'
+    project: odlparent
+    project-name: odlparent
+    stream: master
+    branch: master
+    distribution_branch: master
+
     jdk: openjdk8
     jdks:
       - openjdk8
     maven:
       - mvn33:
           mvn-version: mvn33
-    mvn-settings: 'odlparent-settings'
-    mvn-goals: 'clean install'
+    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-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: ''
@@ -39,7 +76,6 @@
       - '{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}'
 
@@ -68,7 +104,6 @@
       - '{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: boron