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

diff --git a/jjb/bier/bier.yaml b/jjb/bier/bier.yaml
index 4cbf05927..9a01f1090 100644
--- a/jjb/bier/bier.yaml
+++ b/jjb/bier/bier.yaml
@@ -1,79 +1,85 @@
 ---
 - project:
-    name: bier-oxygen
+    name: bier-magnesium
     jobs:
-      - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
+      - gerrit-release-merge
       - odl-maven-jobs
+      - odl-maven-verify-jobs
 
-    stream: oxygen
+    stream: magnesium
     project: 'bier'
     project-name: 'bier'
     branch: 'master'
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
+    build-node: centos7-builder-2c-8g
+    build-timeout: 90
     mvn-settings: 'bier-settings'
-    mvn-goals: 'clean install'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    mvn-opts: '-Xmx1024m'
     dependencies: ''
     email-upstream: '[bier]'
-    archive-artifacts: ''
+    disable-job: true
 
     # Used by the release job
     staging-profile-id: 942a8075b1f2a
 
 - project:
-    name: bier-nitrogen
+    name: bier-sodium
     jobs:
-      - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
       - odl-maven-jobs
+      - odl-maven-verify-jobs
 
-    stream: nitrogen
+    stream: sodium
     project: 'bier'
     project-name: 'bier'
-    branch: 'stable/nitrogen'
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
+    branch: 'stable/sodium'
+    build-node: centos7-builder-2c-8g
+    build-timeout: 90
     mvn-settings: 'bier-settings'
-    mvn-goals: 'clean install'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    mvn-opts: '-Xmx1024m'
     dependencies: ''
     email-upstream: '[bier]'
-    archive-artifacts: ''
+    disable-job: true
 
     # Used by the release job
     staging-profile-id: 942a8075b1f2a
 
 - project:
-    name: bier-carbon
+    name: bier-neon
     jobs:
-      - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
       - odl-maven-jobs
+      - odl-maven-verify-jobs
 
-    stream: carbon
+    stream: neon
     project: 'bier'
     project-name: 'bier'
-    branch: 'stable/carbon'
-    karaf-version: karaf3
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
+    branch: 'stable/neon'
+    build-node: centos7-builder-2c-8g
+    build-timeout: 90
     mvn-settings: 'bier-settings'
-    mvn-goals: 'clean install'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    mvn-opts: '-Xmx1024m'
     dependencies: ''
     email-upstream: '[bier]'
-    archive-artifacts: ''
+    disable-job: true
+
+    # Used by the release job
+    staging-profile-id: 942a8075b1f2a
+
+- project:
+    name: bier-fluorine
+    jobs:
+      - odl-maven-jobs
+      - odl-maven-verify-jobs
+
+    stream: fluorine
+    project: 'bier'
+    project-name: 'bier'
+    branch: 'stable/fluorine'
+    build-node: centos7-builder-2c-8g
+    build-timeout: 90
+    mvn-settings: 'bier-settings'
+    mvn-opts: '-Xmx1024m'
+    dependencies: ''
+    email-upstream: '[bier]'
+    disable-job: true
 
     # Used by the release job
     staging-profile-id: 942a8075b1f2a
@@ -86,6 +92,13 @@
     project: 'bier'
     project-name: 'bier'
     branch: 'master'
+    build-node: centos7-builder-2c-8g
     mvn-settings: 'bier-settings'
-    mvn-goals: 'clean install'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    mvn-opts: '-Xmx1024m'
+    disable-job: true
+
+- project:
+    name: bier-view
+    views:
+      - project-view
+    project-name: bier