X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fbier%2Fbier.yaml;h=98796735d83cc1811c401239df8219a19f4cd89c;hb=42c19be635a4fc042efca606d61fa7b4caf0e436;hp=c29d5a2d21209a50234cfe340586f252b46adf2d;hpb=d429e518be01b2dcbe3094399826489fdea55381;p=releng%2Fbuilder.git

diff --git a/jjb/bier/bier.yaml b/jjb/bier/bier.yaml
index c29d5a2d2..98796735d 100644
--- a/jjb/bier/bier.yaml
+++ b/jjb/bier/bier.yaml
@@ -2,17 +2,15 @@
 - project:
     name: bier-oxygen
     jobs:
-      - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
-      - '{project-name}-merge-{stream}'
-      - '{project-name}-verify-{stream}-{maven}-{jdks}'
+      - odl-maven-jobs
 
     stream: oxygen
     project: 'bier'
     project-name: 'bier'
     branch: 'master'
-    jdk: openjdk8
+    build-timeout: 90
     jdks:
       - openjdk8
     maven:
@@ -25,20 +23,20 @@
     email-upstream: '[bier]'
     archive-artifacts: ''
 
+    # Used by the release job
+    staging-profile-id: 942a8075b1f2a
+
 - project:
     name: bier-nitrogen
     jobs:
-      - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
-      - '{project-name}-merge-{stream}'
-      - '{project-name}-verify-{stream}-{maven}-{jdks}'
+      - odl-maven-jobs
 
     stream: nitrogen
     project: 'bier'
     project-name: 'bier'
     branch: 'stable/nitrogen'
-    jdk: openjdk8
     jdks:
       - openjdk8
     maven:
@@ -51,21 +49,21 @@
     email-upstream: '[bier]'
     archive-artifacts: ''
 
+    # Used by the release job
+    staging-profile-id: 942a8075b1f2a
+
 - project:
     name: bier-carbon
     jobs:
-      - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
-      - '{project-name}-merge-{stream}'
-      - '{project-name}-verify-{stream}-{maven}-{jdks}'
+      - odl-maven-jobs
 
     stream: carbon
     project: 'bier'
     project-name: 'bier'
     branch: 'stable/carbon'
     karaf-version: karaf3
-    jdk: openjdk8
     jdks:
       - openjdk8
     maven:
@@ -78,10 +76,13 @@
     email-upstream: '[bier]'
     archive-artifacts: ''
 
+    # Used by the release job
+    staging-profile-id: 942a8075b1f2a
+
 - project:
     name: bier-sonar
     jobs:
-      - '{project-name}-sonar'
+      - gerrit-maven-sonar
 
     project: 'bier'
     project-name: 'bier'