Merge "Add a prefix variable to defaults as blank"

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

diff --git a/jjb/federation/federation.yaml b/jjb/federation/federation.yaml
index afb245e5232b2b04acd03fccb42932625d662dce..b4180e1b32ee93012aef3dfab9a5cd582fc1a4b7 100644 (file)
--- a/jjb/federation/federation.yaml
+++ b/jjb/federation/federation.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
 
     project: 'federation'
     project-name: 'federation'
@@ -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
 
     project: 'federation'
     project-name: 'federation'
@@ -60,9 +58,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
 
     project: 'federation'
     project-name: 'federation'
@@ -87,7 +84,7 @@
 - project:
     name: federation-sonar
     jobs:
-      - '{project-name}-sonar'
+      - gerrit-maven-sonar
 
     project: 'federation'
     project-name: 'federation'