Merge "add support for JVM monitoring"

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

diff --git a/jjb/yangtools/yangtools.yaml b/jjb/yangtools/yangtools.yaml
index 02359c7ac27400c5f01b3ad356393d4616c9755c..5facaeae0629119a1f81524438950a0b0abd54bb 100644 (file)
--- a/jjb/yangtools/yangtools.yaml
+++ b/jjb/yangtools/yangtools.yaml
@@ -4,15 +4,14 @@
     jobs:
       - 'gerrit-release-merge'
       - odl-maven-jobs-jdk11
-      - odl-maven-verify-jobs:
-          java-version:
-            - openjdk11
+      - odl-maven-verify-jobs
 
     project: yangtools
     project-name: yangtools
     branch: master
     stream: master
 
+    java-version: 'openjdk11'
     mvn-settings: 'yangtools-settings'
 
     dependencies: ''
@@ -82,38 +81,10 @@
     # Used by the release job
     staging-profile-id: 1271cf710cc09d
 
-- project:
-    name: yangtools-v2.0.x
-    jobs:
-      - odl-maven-jobs
-      - odl-maven-verify-jobs
-
-    project: yangtools
-    project-name: yangtools
-    branch: v2.0.x
-    stream: v2.0.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-sonar
     jobs:
       - gerrit-maven-sonar:
-          java-version: openjdk11
           mvn-params: >
             -Dodl.jacoco.aggregateFile=$WORKSPACE/target/jacoco.exec
             -Dsonar.jacoco.reportPath=$WORKSPACE/target/jacoco.exec
@@ -122,6 +93,7 @@
     project: 'yangtools'
     project-name: 'yangtools'
     branch: 'master'
+    java-version: 'openjdk11'
     mvn-settings: 'yangtools-settings'
     mvn-opts: '-Xmx1024m'