Merge "Add knob for odlparent topic patch checkout"

[releng/builder.git] / jjb / odlparent / odlparent.yaml

diff --git a/jjb/odlparent/odlparent.yaml b/jjb/odlparent/odlparent.yaml
index a1abf4669de961921764172b9c3c49cd0fea6658..512fe25704b17cb2675eb5492390c42aae9d11a8 100644 (file)
--- a/jjb/odlparent/odlparent.yaml
+++ b/jjb/odlparent/odlparent.yaml
@@ -15,7 +15,6 @@
     mvn-settings: odlparent-settings
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     mvn-version: mvn35
-    sign-artifacts: true
 
     dependencies: ''
     email-upstream: '[odlparent]'
@@ -31,7 +30,7 @@
     staging-profile-id: 880d5ac25eaa
 
 - project:
-    name: odlparent-3.1.x
+    name: odlparent-4.0.x
     jobs:
       - '{project-name}-maven-javadoc-jobs'
       - odl-maven-jobs
@@ -39,13 +38,12 @@
 
     project: odlparent
     project-name: odlparent
-    stream: 3.1.x
-    branch: 3.1.x
+    stream: 4.0.x
+    branch: 4.0.x
     distribution_branch: master
 
     mvn-settings: odlparent-settings
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    sign-artifacts: true
 
     dependencies: ''
     email-upstream: '[odlparent]'
@@ -62,7 +60,7 @@
     staging-profile-id: 880d5ac25eaa
 
 - project:
-    name: odlparent-3.0.x
+    name: odlparent-3.1.x
     jobs:
       - '{project-name}-maven-javadoc-jobs'
       - odl-maven-jobs
@@ -70,13 +68,12 @@
 
     project: odlparent
     project-name: odlparent
-    stream: 3.0.x
-    branch: 3.0.x
+    stream: 3.1.x
+    branch: 3.1.x
     distribution_branch: master
 
     mvn-settings: odlparent-settings
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    sign-artifacts: true
 
     dependencies: ''
     email-upstream: '[odlparent]'
@@ -95,7 +92,10 @@
 - project:
     name: odlparent-sonar
     jobs:
-      - gerrit-maven-sonar
+      - gerrit-maven-sonar:
+          mvn-params: >
+            -Dodl.jacoco.aggregateFile=$WORKSPACE/target/jacoco.exec
+            -Dsonar.jacoco.reportPath=$WORKSPACE/target/jacoco.exec
 
     project: 'odlparent'
     project-name: 'odlparent'
@@ -103,8 +103,8 @@
     mvn-settings: 'odlparent-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
 
-- view:
-    name: odlparent
-    description: 'List of odlparent jobs'
-    regex: '^odlparent-.*'
-    <<: *releng_view_common
+- project:
+    name: odlparent-view
+    views:
+      - project-view
+    project-name: odlparent