X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fodlparent%2Fodlparent.yaml;h=a1e295cfce930f66d56f30c891ba913a907edecc;hb=7ea27cc20a9f252f4196db2ce52da4ef7c3b73cb;hp=5f3c5d2ec72de5427772635b417c31b943c5bc0d;hpb=6491c9083b067c067aaee529fd686a08e71a6ded;p=releng%2Fbuilder.git

diff --git a/jjb/odlparent/odlparent.yaml b/jjb/odlparent/odlparent.yaml
index 5f3c5d2ec..a1e295cfc 100644
--- a/jjb/odlparent/odlparent.yaml
+++ b/jjb/odlparent/odlparent.yaml
@@ -2,12 +2,9 @@
 - project:
     name: odlparent-master
     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-name}-maven-javadoc-jobs'
+      - gerrit-tox-verify
 
     project: odlparent
     project-name: odlparent
@@ -15,7 +12,6 @@
     branch: master
     distribution_branch: master
 
-    jdk: openjdk8
     jdks:
       - openjdk8
     maven:
@@ -28,21 +24,23 @@
 
     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
-    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-name}-maven-javadoc-jobs'
+      - gerrit-tox-verify
 
     project: odlparent
     project-name: odlparent
@@ -50,7 +48,6 @@
     branch: 2.0.x
     distribution_branch: master
 
-    jdk: openjdk8
     jdks:
       - openjdk8
     maven:
@@ -63,28 +60,32 @@
 
     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
-    settings-file: odlparent-settings
+    javadoc-path: org.opendaylight.$PROJECT/$STREAM
     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}-verify-{stream}-{maven}-{jdks}'
-      - '{project-name}-verify-tox-{stream}'
+      - '{project-name}-maven-jobs'
+      - '{project-name}-maven-javadoc-jobs'
+      - gerrit-tox-verify
 
     stream: carbon
     project: 'odlparent'
     project-name: 'odlparent'
     branch: 'stable/carbon'
     karaf-version: karaf3
-    jdk: openjdk8
     jdks:
       - openjdk8
     maven:
@@ -95,40 +96,22 @@
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: ''
     email-upstream: '[odlparent]'
-    archive-artifacts: ''
-
-- project:
-    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}'
+    archive-artifacts: >
+        **/*.prop
+        **/*.log
+        **/target/surefire-reports/*-output.txt
+        **/target/failsafe-reports/failsafe-summary.xml
+        **/hs_err_*.log
+        **/target/feature/feature.xml
 
-    stream: boron
-    project: 'odlparent'
-    project-name: 'odlparent'
-    branch: 'stable/boron'
-    karaf-version: karaf3
-    jdk: openjdk8
-    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: ''
+    # Used by the release job
+    javadoc-path: org.opendaylight.$PROJECT/$STREAM
+    staging-profile-id: 880d5ac25eaa
 
 - project:
     name: odlparent-sonar
     jobs:
-      - '{project-name}-sonar'
+      - gerrit-maven-sonar
 
     project: 'odlparent'
     project-name: 'odlparent'