X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fyangtools%2Fyangtools.yaml;h=2ef1116850e537ff15633b0a444be52557b92eed;hb=807fca79b9cbd070495690797e1b0cc019caf5f9;hp=c7d14dab5d96bc97902928474a71307104d034c3;hpb=9f80eab4fa3bf05322ca685151148b7a3cf12327;p=releng%2Fbuilder.git

diff --git a/jjb/yangtools/yangtools.yaml b/jjb/yangtools/yangtools.yaml
index c7d14dab5..2ef111685 100644
--- a/jjb/yangtools/yangtools.yaml
+++ b/jjb/yangtools/yangtools.yaml
@@ -2,7 +2,8 @@
 - project:
     name: yangtools-master
     jobs:
-      - '{project-name}-maven-javadoc-jobs'
+      - '{project-name}-maven-javadoc-jobs':
+          disable-job: true
       - odl-maven-jobs
 
     project: yangtools
@@ -11,7 +12,7 @@
     stream: master
 
     mvn-settings: 'yangtools-settings'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    mvn-opts: '-Xmx1024m'
 
     dependencies: ''
     email-upstream: '[yangtools]'
@@ -27,22 +28,50 @@
     staging-profile-id: 1271cf710cc09d
 
 - project:
-    name: yangtools-nitrogen
+    name: yangtools-v2.1.x
     jobs:
-      - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-maven-javadoc-jobs'
+      - '{project-name}-maven-javadoc-jobs':
+          disable-job: true
       - odl-maven-jobs
 
-    stream: nitrogen
-    project: 'yangtools'
-    project-name: 'yangtools'
-    branch: 'v1.2.x'
-    distribution_branch: 'stable/nitrogen'
+    project: yangtools
+    project-name: yangtools
+    branch: v2.1.x
+    stream: v2.1.x
+
+    mvn-settings: 'yangtools-settings'
+    mvn-opts: '-Xmx1024m'
+
+    dependencies: ''
+    email-upstream: '[yangtools]'
+    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: 1271cf710cc09d
+
+- project:
+    name: yangtools-v2.0.x
+    jobs:
+      - '{project-name}-maven-javadoc-jobs':
+          disable-job: true
+      - odl-maven-jobs
+
+    project: yangtools
+    project-name: yangtools
+    branch: v2.0.x
+    stream: v2.0.x
+
     mvn-settings: 'yangtools-settings'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    mvn-opts: '-Xmx1024m'
 
-    dependencies: 'odlparent-merge-{stream}'
-    email-upstream: '[yangtools] [odlparent]'
+    dependencies: ''
+    email-upstream: '[yangtools]'
     archive-artifacts: >
         **/*.prop
         **/*.log
@@ -57,10 +86,20 @@
 - project:
     name: yangtools-sonar
     jobs:
-      - gerrit-maven-sonar
+      - gerrit-maven-sonar:
+          mvn-params: >
+            -Dodl.jacoco.aggregateFile=$WORKSPACE/target/jacoco.exec
+            -Dsonar.jacoco.reportPath=$WORKSPACE/target/jacoco.exec
+            -Dskip.karaf.featureTest=true
 
     project: 'yangtools'
     project-name: 'yangtools'
     branch: 'master'
     mvn-settings: 'yangtools-settings'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    mvn-opts: '-Xmx1024m'
+
+- project:
+    name: yangtools-view
+    views:
+      - project-view
+    project-name: yangtools