X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fodlparent%2Fodlparent.yaml;h=46a237a5ce295af0568415698ba102ba92e63f2e;hb=39a0450315a14058a0c8fd7eb8c53fad2637249f;hp=b9fc80aa5879a20fe81f707677fb50d7c8f777c7;hpb=bd47fbd3e4d8688d5e789ee814a78d6979bc9a46;p=releng%2Fbuilder.git

diff --git a/jjb/odlparent/odlparent.yaml b/jjb/odlparent/odlparent.yaml
index b9fc80aa5..46a237a5c 100644
--- a/jjb/odlparent/odlparent.yaml
+++ b/jjb/odlparent/odlparent.yaml
@@ -12,15 +12,9 @@
     branch: master
     distribution_branch: master
 
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: mvn33
     mvn-settings: odlparent-settings
-    mvn-goals: clean install
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    mvn-version: mvn33
+    mvn-version: mvn35
 
     dependencies: ''
     email-upstream: '[odlparent]'
@@ -35,6 +29,66 @@
     # Used by the release job
     staging-profile-id: 880d5ac25eaa
 
+- project:
+    name: odlparent-3.1.x
+    jobs:
+      - '{project-name}-maven-javadoc-jobs'
+      - odl-maven-jobs
+      - gerrit-tox-verify
+
+    project: odlparent
+    project-name: odlparent
+    stream: 3.1.x
+    branch: 3.1.x
+    distribution_branch: master
+
+    mvn-settings: odlparent-settings
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+
+    dependencies: ''
+    email-upstream: '[odlparent]'
+    archive-artifacts: >
+        **/*.prop
+        **/*.log
+        **/target/surefire-reports/*-output.txt
+        **/target/failsafe-reports/failsafe-summary.xml
+        **/hs_err_*.log
+        **/target/feature/feature.xml
+
+    # Used by the release job
+    javadoc-path: org.opendaylight.$PROJECT/$STREAM
+    staging-profile-id: 880d5ac25eaa
+
+- project:
+    name: odlparent-3.0.x
+    jobs:
+      - '{project-name}-maven-javadoc-jobs'
+      - odl-maven-jobs
+      - gerrit-tox-verify
+
+    project: odlparent
+    project-name: odlparent
+    stream: 3.0.x
+    branch: 3.0.x
+    distribution_branch: master
+
+    mvn-settings: odlparent-settings
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+
+    dependencies: ''
+    email-upstream: '[odlparent]'
+    archive-artifacts: >
+        **/*.prop
+        **/*.log
+        **/target/surefire-reports/*-output.txt
+        **/target/failsafe-reports/failsafe-summary.xml
+        **/hs_err_*.log
+        **/target/feature/feature.xml
+
+    # Used by the release job
+    javadoc-path: org.opendaylight.$PROJECT/$STREAM
+    staging-profile-id: 880d5ac25eaa
+
 - project:
     name: odlparent-2.0.x
     jobs:
@@ -48,15 +102,8 @@
     branch: 2.0.x
     distribution_branch: master
 
-    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]'
@@ -86,13 +133,7 @@
     project-name: 'odlparent'
     branch: 'stable/carbon'
     karaf-version: karaf3
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
     mvn-settings: 'odlparent-settings'
-    mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: ''
     email-upstream: '[odlparent]'
@@ -117,5 +158,4 @@
     project-name: 'odlparent'
     branch: 'master'
     mvn-settings: 'odlparent-settings'
-    mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'