Merge "Remove odlparent-6.0.x jobs"

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

diff --git a/jjb/yangtools/yangtools.yaml b/jjb/yangtools/yangtools.yaml
index 5e64c12657bd2e0e397d74f73daca5c0a3e50dbc..6b3aa703fcac71c1937b041c4edc80d597546c3f 100644 (file)
--- a/jjb/yangtools/yangtools.yaml
+++ b/jjb/yangtools/yangtools.yaml
@@ -28,15 +28,15 @@
     staging-profile-id: 1271cf710cc09d
 
 - project:
-    name: yangtools-5.0.x
+    name: yangtools-6.0.x
     jobs:
       - odl-maven-jobs-jdk11
       - odl-maven-verify-jobs
 
     project: yangtools
     project-name: yangtools
-    branch: 5.0.x
-    stream: 5.0.x
+    branch: 6.0.x
+    stream: 6.0.x
 
     java-version: "openjdk11"
     mvn-settings: "yangtools-settings"
@@ -56,45 +56,19 @@
     staging-profile-id: 1271cf710cc09d
 
 - project:
-    name: yangtools-4.0.x
+    name: yangtools-5.0.x
     jobs:
       - odl-maven-jobs-jdk11
       - odl-maven-verify-jobs
 
     project: yangtools
     project-name: yangtools
-    branch: 4.0.x
-    stream: 4.0.x
+    branch: 5.0.x
+    stream: 5.0.x
 
     java-version: "openjdk11"
     mvn-settings: "yangtools-settings"
-
-    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-v3.0.x
-    jobs:
-      - odl-maven-jobs
-      - odl-maven-verify-jobs
-
-    project: yangtools
-    project-name: yangtools
-    branch: v3.0.x
-    stream: v3.0.x
-
-    mvn-settings: "yangtools-settings"
-    mvn-opts: "-Xmx1024m"
+    mvn-version: mvn36
 
     dependencies: ""
     email-upstream: "[yangtools]"