Merge changes from topic 'packer-revert-centos'

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

diff --git a/jjb/federation/federation.yaml b/jjb/federation/federation.yaml
index 305192f6645f018b4df5d9f97d756704d3c93fc7..10b837d8949fe0a8ef002e7f86731e26a91f17a0 100644 (file)
--- a/jjb/federation/federation.yaml
+++ b/jjb/federation/federation.yaml
@@ -2,17 +2,15 @@
 - project:
     name: federation-oxygen
     jobs:
-      - '{project-name}-clm-{stream}'
+      - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
+      - '{project-name}-maven-jobs'
       - '{project-name}-merge-{stream}'
-      - '{project-name}-verify-{stream}-{maven}-{jdks}'
-      - '{project-name}-distribution-check-{stream}'
 
     project: 'federation'
     project-name: 'federation'
     stream: oxygen
     branch: 'master'
-    jdk: openjdk8
     jdks:
       - openjdk8
     maven:
@@ -25,20 +23,21 @@
     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}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
+      - '{project-name}-maven-jobs'
       - '{project-name}-merge-{stream}'
-      - '{project-name}-verify-{stream}-{maven}-{jdks}'
-      - '{project-name}-distribution-check-{stream}'
 
     project: 'federation'
     project-name: 'federation'
     stream: nitrogen
     branch: 'stable/nitrogen'
-    jdk: openjdk8
     jdks:
       - openjdk8
     maven:
@@ -51,21 +50,22 @@
     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}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
+      - '{project-name}-maven-jobs'
       - '{project-name}-merge-{stream}'
-      - '{project-name}-verify-{stream}-{maven}-{jdks}'
-      - '{project-name}-distribution-check-{stream}'
 
     project: 'federation'
     project-name: 'federation'
     stream: carbon
     branch: 'stable/carbon'
     karaf-version: karaf3
-    jdk: openjdk8
     jdks:
       - openjdk8
     maven:
@@ -78,6 +78,9 @@
     email-upstream: '[federation] [odlparent] [yangtools] [controller]'
     archive-artifacts: ''
 
+    # Used by the release job
+    staging-profile-id: 96f78c7a40a24
+
 - project:
     name: federation-sonar
     jobs: