Update sonar jobs to global-jjb

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

diff --git a/jjb/odlparent/odlparent.yaml b/jjb/odlparent/odlparent.yaml
index 86d29a85452370f31254796e0488f3b663cb407c..2c208776422743a2c55df80abbd29e25a9dc20ce 100644 (file)
--- a/jjb/odlparent/odlparent.yaml
+++ b/jjb/odlparent/odlparent.yaml
@@ -3,8 +3,9 @@
     name: odlparent-master
     jobs:
       - '{project-name}-merge-{stream}'
-      - '{project-name}-verify-tox-{stream}'
       - '{project-name}-maven-jobs'
+      - '{project-name}-maven-javadoc-jobs'
+      - gerrit-tox-verify
 
     project: odlparent
     project-name: odlparent
@@ -12,7 +13,6 @@
     branch: master
     distribution_branch: master
 
-    jdk: openjdk8
     jdks:
       - openjdk8
     maven:
@@ -34,8 +34,9 @@
     name: odlparent-2.0.x
     jobs:
       - '{project-name}-merge-{stream}'
-      - '{project-name}-verify-tox-{stream}'
       - '{project-name}-maven-jobs'
+      - '{project-name}-maven-javadoc-jobs'
+      - gerrit-tox-verify
 
     project: odlparent
     project-name: odlparent
@@ -43,7 +44,6 @@
     branch: 2.0.x
     distribution_branch: master
 
-    jdk: openjdk8
     jdks:
       - openjdk8
     maven:
@@ -59,6 +59,7 @@
     archive-artifacts: ''
 
     # Used by the release job
+    javadoc-path: org.opendaylight.$PROJECT/$STREAM
     staging-profile-id: 880d5ac25eaa
 
 - project:
@@ -67,44 +68,15 @@
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
       - '{project-name}-merge-{stream}'
-      - '{project-name}-verify-tox-{stream}'
       - '{project-name}-maven-jobs'
+      - '{project-name}-maven-javadoc-jobs'
+      - gerrit-tox-verify
 
     stream: carbon
     project: 'odlparent'
     project-name: 'odlparent'
     branch: 'stable/carbon'
     karaf-version: karaf3
-    jdk: openjdk8
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
-    mvn-settings: 'odlparent-settings'
-    mvn-goals: 'clean install'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    dependencies: ''
-    email-upstream: '[odlparent]'
-    archive-artifacts: ''
-
-    # Used by the release job
-    staging-profile-id: 880d5ac25eaa
-
-- project:
-    name: odlparent-boron
-    jobs:
-      - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
-      - '{project-name}-merge-{stream}'
-      - '{project-name}-maven-jobs'
-
-    stream: boron
-    project: 'odlparent'
-    project-name: 'odlparent'
-    branch: 'stable/boron'
-    karaf-version: karaf3
-    jdk: openjdk8
     jdks:
       - openjdk8
     maven:
@@ -118,12 +90,13 @@
     archive-artifacts: ''
 
     # Used by the release job
+    javadoc-path: org.opendaylight.$PROJECT/$STREAM
     staging-profile-id: 880d5ac25eaa
 
 - project:
     name: odlparent-sonar
     jobs:
-      - '{project-name}-sonar'
+      - gerrit-maven-sonar
 
     project: 'odlparent'
     project-name: 'odlparent'