X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fbier%2Fbier.yaml;h=943205bdfb3ba6d24c1a432502976bf6f4e91f66;hb=b4cf45c2f7b0f81a395a81f85718df294868429d;hp=759a5564d37cbefca5dcac2d4b76ab05e9e28a89;hpb=4b919f23a7f21163c4177f578c6744bad87b05f7;p=releng%2Fbuilder.git

diff --git a/jjb/bier/bier.yaml b/jjb/bier/bier.yaml
index 759a5564d..943205bdf 100644
--- a/jjb/bier/bier.yaml
+++ b/jjb/bier/bier.yaml
@@ -1,82 +1,39 @@
 ---
 - project:
-    name: bier-oxygen
+    name: bier-fluorine
     jobs:
-      - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
-      - '{project-name}-merge-{stream}'
+      - odl-maven-jobs
 
-    stream: oxygen
+    stream: fluorine
     project: 'bier'
     project-name: 'bier'
     branch: 'master'
-    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}'
-      - '{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'
+    build-node: centos7-builder-2c-8g
+    build-timeout: 90
     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
+    name: bier-oxygen
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
-      - '{project-name}-merge-{stream}'
+      - odl-maven-jobs
 
-    stream: carbon
+    stream: oxygen
     project: 'bier'
     project-name: 'bier'
-    branch: 'stable/carbon'
-    karaf-version: karaf3
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
+    branch: 'stable/oxygen'
+    build-node: centos7-builder-2c-8g
+    build-timeout: 90
     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
@@ -84,11 +41,17 @@
 - project:
     name: bier-sonar
     jobs:
-      - '{project-name}-sonar'
+      - gerrit-maven-sonar
 
     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'
+
+- view:
+    name: bier
+    description: 'List of bier jobs'
+    regex: '^bier-.*'
+    <<: *releng_view_common