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 170b0a4129b65937b2b0117b55e28c8c79acee67..b4180e1b32ee93012aef3dfab9a5cd582fc1a4b7 100644 (file)
--- a/jjb/federation/federation.yaml
+++ b/jjb/federation/federation.yaml
@@ -2,11 +2,10 @@
 - project:
     name: federation-oxygen
     jobs:
-      - '{project-name}-clm-{stream}'
-      - '{project-name}-integration-{stream}'
-      - '{project-name}-merge-{stream}'
-      - '{project-name}-verify-{stream}-{maven}-{jdks}'
       - '{project-name}-distribution-check-{stream}'
+      - '{project-name}-integration-{stream}'
+      - '{project-name}-maven-javadoc-jobs'
+      - odl-maven-jobs
 
     project: 'federation'
     project-name: 'federation'
@@ -24,14 +23,16 @@
     email-upstream: '[federation] [odlparent] [yangtools] [controller]'
     archive-artifacts: ''
 
+    # Used by the release job
+    staging-profile-id: 96f78c7a40a24
+
 - project:
     name: federation-nitrogen
     jobs:
-      - '{project-name}-clm-{stream}'
-      - '{project-name}-integration-{stream}'
-      - '{project-name}-merge-{stream}'
-      - '{project-name}-verify-{stream}-{maven}-{jdks}'
       - '{project-name}-distribution-check-{stream}'
+      - '{project-name}-integration-{stream}'
+      - '{project-name}-maven-javadoc-jobs'
+      - odl-maven-jobs
 
     project: 'federation'
     project-name: 'federation'
@@ -49,14 +50,16 @@
     email-upstream: '[federation] [odlparent] [yangtools] [controller]'
     archive-artifacts: ''
 
+    # Used by the release job
+    staging-profile-id: 96f78c7a40a24
+
 - project:
     name: federation-carbon
     jobs:
-      - '{project-name}-clm-{stream}'
-      - '{project-name}-integration-{stream}'
-      - '{project-name}-merge-{stream}'
-      - '{project-name}-verify-{stream}-{maven}-{jdks}'
       - '{project-name}-distribution-check-{stream}'
+      - '{project-name}-integration-{stream}'
+      - '{project-name}-maven-javadoc-jobs'
+      - odl-maven-jobs
 
     project: 'federation'
     project-name: 'federation'
@@ -75,10 +78,13 @@
     email-upstream: '[federation] [odlparent] [yangtools] [controller]'
     archive-artifacts: ''
 
+    # Used by the release job
+    staging-profile-id: 96f78c7a40a24
+
 - project:
     name: federation-sonar
     jobs:
-      - '{project-name}-sonar'
+      - gerrit-maven-sonar
 
     project: 'federation'
     project-name: 'federation'