X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fhoneycomb%2Fvbd%2Fvbd.yaml;h=59a0c61460389b009d0bd4620ba21a62ce160135;hb=refs%2Fchanges%2F25%2F80125%2F1;hp=737576a13d1a183d0892f36e57da5453561da601;hpb=26c20ade21e2629099602ca890b9a67f2b9a2586;p=releng%2Fbuilder.git

diff --git a/jjb/honeycomb/vbd/vbd.yaml b/jjb/honeycomb/vbd/vbd.yaml
index 737576a13..eb8ef932b 100644
--- a/jjb/honeycomb/vbd/vbd.yaml
+++ b/jjb/honeycomb/vbd/vbd.yaml
@@ -1,117 +1,85 @@
 ---
 - project:
-    name: vbd-oxygen
+    name: vbd-sodium
     jobs:
-      - '{project-name}-clm-{stream}'
-      - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
-      - '{project-name}-merge-{stream}'
-      - '{project-name}-verify-{stream}-{maven}-{jdks}'
+      - odl-maven-jobs
 
-    stream: oxygen
+    stream: sodium
     project: 'honeycomb/vbd'
     project-name: 'vbd'
     branch: 'master'
-    jdk: openjdk8
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
     mvn-settings: 'honeycomb-vbd-settings'
-    mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: ''
     email-upstream: '[vbd]'
-    archive-artifacts: ''
+
+    # Used by the release job
+    staging-profile-id: 96fc362c36862
 
 - project:
-    name: vbd-nitrogen
+    name: vbd-neon
     jobs:
-      - '{project-name}-clm-{stream}'
-      - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
-      - '{project-name}-merge-{stream}'
-      - '{project-name}-verify-{stream}-{maven}-{jdks}'
+      - odl-maven-jobs
 
-    stream: nitrogen
+    stream: neon
     project: 'honeycomb/vbd'
     project-name: 'vbd'
-    branch: 'stable/nitrogen'
-    jdk: openjdk8
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
+    branch: 'stable/neon'
     mvn-settings: 'honeycomb-vbd-settings'
-    mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: ''
     email-upstream: '[vbd]'
-    archive-artifacts: ''
+
+    # Used by the release job
+    staging-profile-id: 96fc362c36862
 
 - project:
-    name: vbd-carbon
+    name: vbd-fluorine
     jobs:
-      - '{project-name}-clm-{stream}'
-      - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
-      - '{project-name}-merge-{stream}'
-      - '{project-name}-verify-{stream}-{maven}-{jdks}'
+      - odl-maven-jobs
 
-    stream: carbon
+    stream: fluorine
     project: 'honeycomb/vbd'
     project-name: 'vbd'
-    branch: 'stable/carbon'
-    karaf-version: karaf3
-    jdk: openjdk8
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
+    branch: 'stable/fluorine'
     mvn-settings: 'honeycomb-vbd-settings'
-    mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: ''
     email-upstream: '[vbd]'
-    archive-artifacts: ''
+
+    # Used by the release job
+    staging-profile-id: 96fc362c36862
 
 - project:
-    name: vbd-boron
+    name: vbd-oxygen
     jobs:
-      - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
-      - '{project-name}-merge-{stream}'
-      - '{project-name}-verify-{stream}-{maven}-{jdks}'
+      - odl-maven-jobs
 
-    stream: boron
+    stream: oxygen
     project: 'honeycomb/vbd'
     project-name: 'vbd'
-    branch: 'stable/boron'
-    karaf-version: karaf3
-    jdk: openjdk8
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
+    branch: 'stable/oxygen'
     mvn-settings: 'honeycomb-vbd-settings'
-    mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: ''
     email-upstream: '[vbd]'
-    archive-artifacts: ''
+
+    # Used by the release job
+    staging-profile-id: 96fc362c36862
 
 - project:
     name: vbd-sonar
     jobs:
-      - '{project-name}-sonar'
+      - gerrit-maven-sonar
     project: 'honeycomb/vbd'
     project-name: 'vbd'
     branch: 'master'
     mvn-settings: 'honeycomb-vbd-settings'
-    mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+
+- project:
+    name: vbd-view
+    views:
+      - project-view
+    project-name: vbd