X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fbier%2Fbier.yaml;h=98796735d83cc1811c401239df8219a19f4cd89c;hb=f5dec3a1314025a15de3e5062ea5ab63d81fb34f;hp=7406abbfe26ed082422dbc0d7fe6f8cb423427ed;hpb=9b96b4cf0744a0c23381d7358bb64fd9cd2b636b;p=releng%2Fbuilder.git

diff --git a/jjb/bier/bier.yaml b/jjb/bier/bier.yaml
index 7406abbfe..98796735d 100644
--- a/jjb/bier/bier.yaml
+++ b/jjb/bier/bier.yaml
@@ -1,19 +1,42 @@
 ---
 - project:
-    name: bier-nirtogen
+    name: bier-oxygen
     jobs:
-      - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
-      - '{project-name}-merge-{stream}'
-      - '{project-name}-validate-autorelease-{stream}'
-      - '{project-name}-verify-{stream}-{maven}-{jdks}'
+      - odl-maven-jobs
 
-    stream: nitrogen
+    stream: oxygen
     project: 'bier'
     project-name: 'bier'
     branch: 'master'
-    jdk: openjdk8
+    build-timeout: 90
+    jdks:
+      - openjdk8
+    maven:
+      - mvn33:
+          mvn-version: 'mvn33'
+    mvn-settings: 'bier-settings'
+    mvn-goals: 'clean install'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    dependencies: ''
+    email-upstream: '[bier]'
+    archive-artifacts: ''
+
+    # Used by the release job
+    staging-profile-id: 942a8075b1f2a
+
+- project:
+    name: bier-nitrogen
+    jobs:
+      - '{project-name}-distribution-check-{stream}'
+      - '{project-name}-integration-{stream}'
+      - odl-maven-jobs
+
+    stream: nitrogen
+    project: 'bier'
+    project-name: 'bier'
+    branch: 'stable/nitrogen'
     jdks:
       - openjdk8
     maven:
@@ -26,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}-validate-autorelease-{stream}'
-      - '{project-name}-verify-{stream}-{maven}-{jdks}'
+      - odl-maven-jobs
 
     stream: carbon
     project: 'bier'
     project-name: 'bier'
     branch: 'stable/carbon'
-    jdk: openjdk8
+    karaf-version: karaf3
     jdks:
       - openjdk8
     maven:
@@ -53,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'