Merge "CI: Publish logs for bgp MRI jobs"

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

diff --git a/jjb/yangtools/yangtools.yaml b/jjb/yangtools/yangtools.yaml
index d33592d8db864ac553327f662209f7cf990836f2..296e03610136e6b1c487f283487ad0c230ea79ae 100644 (file)
--- a/jjb/yangtools/yangtools.yaml
+++ b/jjb/yangtools/yangtools.yaml
@@ -28,15 +28,15 @@
     staging-profile-id: 1271cf710cc09d
 
 - project:
-    name: yangtools-6.0.x
+    name: yangtools-7.0.x
     jobs:
       - odl-maven-jobs-jdk11
       - odl-maven-verify-jobs
 
     project: yangtools
     project-name: yangtools
-    branch: 6.0.x
-    stream: 6.0.x
+    branch: 7.0.x
+    stream: 7.0.x
 
     java-version: "openjdk11"
     mvn-settings: "yangtools-settings"
@@ -56,15 +56,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"
@@ -83,33 +83,6 @@
     # Used by the release job
     staging-profile-id: 1271cf710cc09d
 
-- project:
-    name: yangtools-4.0.x
-    jobs:
-      - odl-maven-jobs-jdk11
-      - odl-maven-verify-jobs
-
-    project: yangtools
-    project-name: yangtools
-    branch: 4.0.x
-    stream: 4.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-release-management
     jobs:
@@ -120,6 +93,9 @@
 
     build-node: centos7-builder-2c-1g
     mvn-settings: yangtools-settings
+    # Needs to be rather long until we sort out the performance of
+    # https://nexus.opendaylight.org/content/repositories/opendaylight.release/org/opendaylight/
+    build-timeout: 90
 
 - project:
     name: yangtools-sonar