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 6b87b0719cc3eafeb0cbdcacfccc137897e07449..512fe25704b17cb2675eb5492390c42aae9d11a8 100644 (file)
--- a/jjb/odlparent/odlparent.yaml
+++ b/jjb/odlparent/odlparent.yaml
@@ -30,7 +30,7 @@
     staging-profile-id: 880d5ac25eaa
 
 - project:
-    name: odlparent-3.2.x
+    name: odlparent-4.0.x
     jobs:
       - '{project-name}-maven-javadoc-jobs'
       - odl-maven-jobs
@@ -38,8 +38,8 @@
 
     project: odlparent
     project-name: odlparent
-    stream: 3.2.x
-    branch: 3.2.x
+    stream: 4.0.x
+    branch: 4.0.x
     distribution_branch: master
 
     mvn-settings: odlparent-settings
@@ -89,43 +89,22 @@
     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-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'
     branch: 'master'
     mvn-settings: 'odlparent-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+
+- project:
+    name: odlparent-view
+    views:
+      - project-view
+    project-name: odlparent