Merge "Switch the csit-hwvtep-openstack to use job prefix"

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

diff --git a/jjb/openflowjava/openflowjava.yaml b/jjb/openflowjava/openflowjava.yaml
index c2f1072d7ec9e03e27091dfb107197131466f4c7..c2a080e1d8072cd51b7bad095a4bd3ad2bb2d5e6 100644 (file)
--- a/jjb/openflowjava/openflowjava.yaml
+++ b/jjb/openflowjava/openflowjava.yaml
@@ -4,9 +4,8 @@
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
       - '{project-name}-maven-javadoc-jobs'
-      - '{project-name}-merge-{stream}'
+      - odl-maven-jobs
 
     stream: nitrogen
     project: 'openflowjava'
@@ -32,9 +31,8 @@
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
       - '{project-name}-maven-javadoc-jobs'
-      - '{project-name}-merge-{stream}'
+      - odl-maven-jobs
 
     stream: carbon
     project: 'openflowjava'
@@ -59,7 +57,7 @@
 - project:
     name: openflowjava-sonar
     jobs:
-      - '{project-name}-sonar'
+      - gerrit-maven-sonar
     project: 'openflowjava'
     project-name: 'openflowjava'
     branch: 'master'