Merge "Remove odlparent-3.0.x jobs"

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

diff --git a/jjb/yangtools/yangtools.yaml b/jjb/yangtools/yangtools.yaml
index 73e9396604c46e79caadda98180174fe4cfdf6f0..2ef1116850e537ff15633b0a444be52557b92eed 100644 (file)
--- 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
@@ -27,15 +28,16 @@
     staging-profile-id: 1271cf710cc09d
 
 - project:
-    name: yangtools-v2.0.x
+    name: yangtools-v2.1.x
     jobs:
-      - '{project-name}-maven-javadoc-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
+    branch: v2.1.x
+    stream: v2.1.x
 
     mvn-settings: 'yangtools-settings'
     mvn-opts: '-Xmx1024m'
@@ -54,15 +56,16 @@
     staging-profile-id: 1271cf710cc09d
 
 - project:
-    name: yangtools-v2.0.6.x
+    name: yangtools-v2.0.x
     jobs:
-      - '{project-name}-maven-javadoc-jobs'
+      - '{project-name}-maven-javadoc-jobs':
+          disable-job: true
       - odl-maven-jobs
 
     project: yangtools
     project-name: yangtools
-    branch: v2.0.6.x
-    stream: v2.0.6.x
+    branch: v2.0.x
+    stream: v2.0.x
 
     mvn-settings: 'yangtools-settings'
     mvn-opts: '-Xmx1024m'
@@ -87,6 +90,7 @@
           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'