X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fbier%2Fbier.yaml;h=4b9c3b86fcc1d51a59cd7be00655a519348554b6;hb=ebb321f1aaa399dc574f0174541d6baed8af97cf;hp=0efb7875a234cbe34a40e078aecfbc94ee7afbe2;hpb=fcaa90e38fd2ed28e0131fc95b4148680ee6857f;p=releng%2Fbuilder.git

diff --git a/jjb/bier/bier.yaml b/jjb/bier/bier.yaml
index 0efb7875a2..4b9c3b86fc 100644
--- a/jjb/bier/bier.yaml
+++ b/jjb/bier/bier.yaml
@@ -1,39 +1,94 @@
 ---
 - project:
-    name: bier-carbon
-    jobs:
-      - '{project-name}-clm-{stream}'
+    name: bier-oxygen
+    jobs:
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
+      - '{project-name}-maven-jobs'
       - '{project-name}-merge-{stream}'
-      - '{project-name}-validate-autorelease-{stream}'
-      - '{project-name}-verify-{stream}-{maven}-{jdks}'
-
-    stream: carbon
-    project: 'bier'
-    project-name: 'bier'
-    branch: 'master'
-    jdk: openjdk8
-    jdks:
+
+    stream: oxygen
+    project: 'bier'
+    project-name: 'bier'
+    branch: 'master'
+    jdks:
       - openjdk8
-    maven:
+    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: ''
-
-- project:
-    name: bier-sonar
-    jobs:
-      - '{project-name}-sonar'
-
-    project: 'bier'
-    project-name: 'bier'
-    branch: 'master'
-    mvn-settings: 'bier-settings'
-    mvn-goals: 'clean install'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    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}'
+      - '{project-name}-maven-jobs'
+      - '{project-name}-merge-{stream}'
+
+    stream: nitrogen
+    project: 'bier'
+    project-name: 'bier'
+    branch: 'stable/nitrogen'
+    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-carbon
+    jobs:
+      - '{project-name}-distribution-check-{stream}'
+      - '{project-name}-integration-{stream}'
+      - '{project-name}-maven-jobs'
+      - '{project-name}-merge-{stream}'
+
+    stream: carbon
+    project: 'bier'
+    project-name: 'bier'
+    branch: 'stable/carbon'
+    karaf-version: karaf3
+    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-sonar
+    jobs:
+      - gerrit-maven-sonar
+
+    project: 'bier'
+    project-name: 'bier'
+    branch: 'master'
+    mvn-settings: 'bier-settings'
+    mvn-goals: 'clean install'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'