X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fbier%2Fbier.yaml;h=12ad1076a07286abc514d3edbcb4e2a50abf849e;hb=cb52af35b0fa1272dec4181513fd3227b4df9f4c;hp=0efb7875a234cbe34a40e078aecfbc94ee7afbe2;hpb=93b797fef8f0f190899a305909b47179801f1eb1;p=releng%2Fbuilder.git

diff --git a/jjb/bier/bier.yaml b/jjb/bier/bier.yaml
index 0efb7875a..be6163729 100644
--- a/jjb/bier/bier.yaml
+++ b/jjb/bier/bier.yaml
@@ -1,39 +1,91 @@
 ---
 - project:
-    name: bier-carbon
-    jobs:
-      - '{project-name}-clm-{stream}'
+    name: bier-fluorine
+    jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
-      - '{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:
-      - 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: ''
-
-- 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'
+      - odl-maven-jobs
+
+    stream: fluorine
+    project: 'bier'
+    project-name: 'bier'
+    branch: 'master'
+    build-node: centos7-builder-2c-8g
+    build-timeout: 90
+    mvn-settings: 'bier-settings'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    dependencies: ''
+    email-upstream: '[bier]'
+
+    # Used by the release job
+    staging-profile-id: 942a8075b1f2a
+
+- project:
+    name: bier-oxygen
+    jobs:
+      - '{project-name}-distribution-check-{stream}'
+      - odl-maven-jobs
+
+    stream: oxygen
+    project: 'bier'
+    project-name: 'bier'
+    branch: 'stable/oxygen'
+    build-node: centos7-builder-2c-8g
+    build-timeout: 90
+    mvn-settings: 'bier-settings'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    dependencies: ''
+    email-upstream: '[bier]'
+
+    # Used by the release job
+    staging-profile-id: 942a8075b1f2a
+
+- project:
+    name: bier-nitrogen
+    jobs:
+      - '{project-name}-distribution-check-{stream}'
+      - odl-maven-jobs
+
+    stream: nitrogen
+    project: 'bier'
+    project-name: 'bier'
+    branch: 'stable/nitrogen'
+    build-node: centos7-builder-2c-8g
+    mvn-settings: 'bier-settings'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    dependencies: ''
+    email-upstream: '[bier]'
+
+    # Used by the release job
+    staging-profile-id: 942a8075b1f2a
+
+- project:
+    name: bier-carbon
+    jobs:
+      - '{project-name}-distribution-check-{stream}'
+      - odl-maven-jobs
+
+    stream: carbon
+    project: 'bier'
+    project-name: 'bier'
+    branch: 'stable/carbon'
+    build-node: centos7-builder-2c-8g
+    karaf-version: karaf3
+    mvn-settings: 'bier-settings'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    dependencies: ''
+    email-upstream: '[bier]'
+
+    # Used by the release job
+    staging-profile-id: 942a8075b1f2a
+
+- project:
+    name: bier-sonar
+    jobs:
+      - gerrit-maven-sonar
+
+    project: 'bier'
+    project-name: 'bier'
+    branch: 'master'
+    build-node: centos7-builder-2c-8g
+    mvn-settings: 'bier-settings'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'