Merge "Run pybot per suite and collect individual logs"

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

diff --git a/jjb/odlparent/odlparent.yaml b/jjb/odlparent/odlparent.yaml
index d0209dff3a8e7d9e1c7bb4b7dc8afd94f4f780dc..2c208776422743a2c55df80abbd29e25a9dc20ce 100644 (file)
--- a/jjb/odlparent/odlparent.yaml
+++ b/jjb/odlparent/odlparent.yaml
@@ -3,9 +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
@@ -13,7 +13,6 @@
     branch: master
     distribution_branch: master
 
-    jdk: openjdk8
     jdks:
       - openjdk8
     maven:
@@ -29,16 +28,15 @@
     archive-artifacts: ''
 
     # Used by the release job
-    javadoc-path: org.opendaylight.$PROJECT/$STREAM
     staging-profile-id: 880d5ac25eaa
 
 - project:
     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
@@ -46,7 +44,6 @@
     branch: 2.0.x
     distribution_branch: master
 
-    jdk: openjdk8
     jdks:
       - openjdk8
     maven:
@@ -71,16 +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:
@@ -100,7 +96,7 @@
 - project:
     name: odlparent-sonar
     jobs:
-      - '{project-name}-sonar'
+      - gerrit-maven-sonar
 
     project: 'odlparent'
     project-name: 'odlparent'