X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fodlparent%2Fodlparent.yaml;h=24da0238326a059a50b5c16bbb1d5da260b7563a;hb=f5611e3768895d4b4ca20c7719a2bd9fe5652fca;hp=b4bb2773f9e7bdca18e7f2089ba6b2db0fdc495c;hpb=9ec64f474adcacf0406f4957413ae78991ede03c;p=releng%2Fbuilder.git

diff --git a/jjb/odlparent/odlparent.yaml b/jjb/odlparent/odlparent.yaml
index b4bb2773f..24da02383 100644
--- a/jjb/odlparent/odlparent.yaml
+++ b/jjb/odlparent/odlparent.yaml
@@ -2,9 +2,8 @@
 - project:
     name: odlparent-master
     jobs:
-      - '{project-name}-merge-{stream}'
-      - '{project-name}-maven-jobs'
       - '{project-name}-maven-javadoc-jobs'
+      - odl-maven-jobs
       - gerrit-tox-verify
 
     project: odlparent
@@ -13,29 +12,88 @@
     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]'
-    archive-artifacts: ''
+    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
     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:
-      - '{project-name}-merge-{stream}'
-      - '{project-name}-maven-jobs'
       - '{project-name}-maven-javadoc-jobs'
+      - odl-maven-jobs
       - gerrit-tox-verify
 
     project: odlparent
@@ -44,19 +102,18 @@
     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]'
-    archive-artifacts: ''
+    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
@@ -66,10 +123,8 @@
     name: odlparent-carbon
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
-      - '{project-name}-merge-{stream}'
-      - '{project-name}-maven-jobs'
       - '{project-name}-maven-javadoc-jobs'
+      - odl-maven-jobs
       - gerrit-tox-verify
 
     stream: carbon
@@ -77,17 +132,17 @@
     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]'
-    archive-artifacts: ''
+    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
@@ -96,11 +151,10 @@
 - project:
     name: odlparent-sonar
     jobs:
-      - '{project-name}-sonar'
+      - gerrit-maven-sonar
 
     project: 'odlparent'
     project-name: 'odlparent'
     branch: 'master'
     mvn-settings: 'odlparent-settings'
-    mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'