X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fhoneycomb%2Fvbd%2Fvbd.yaml;h=f4829d180f15b851a03706820039e495922752e6;hb=b0ee3dcc9ba7c94a5969548f7e818894e65b05d9;hp=a85060f15f7f168fe54fb19c3484fd8c8306a140;hpb=0ee3c05331b174e1be5d2adad43b9bdaae50ffb1;p=releng%2Fbuilder.git

diff --git a/jjb/honeycomb/vbd/vbd.yaml b/jjb/honeycomb/vbd/vbd.yaml
index a85060f15..f4829d180 100644
--- a/jjb/honeycomb/vbd/vbd.yaml
+++ b/jjb/honeycomb/vbd/vbd.yaml
@@ -1,93 +1,83 @@
 ---
 - project:
-    name: vbd-nitrogen
+    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: nitrogen
+    stream: fluorine
     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-carbon
+    name: vbd-oxygen
     jobs:
-      - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
-      - '{project-name}-merge-{stream}'
-      - '{project-name}-validate-autorelease-{stream}'
-      - '{project-name}-verify-{stream}-{maven}-{jdks}'
+      - odl-maven-jobs
 
-    stream: carbon
+    stream: oxygen
     project: 'honeycomb/vbd'
     project-name: 'vbd'
-    branch: 'stable/carbon'
-    karaf-version: karaf3
-    jdk: openjdk8
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
+    branch: 'stable/oxygen'
+    mvn-settings: 'honeycomb-vbd-settings'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    dependencies: ''
+    email-upstream: '[vbd]'
+
+    # Used by the release job
+    staging-profile-id: 96fc362c36862
+
+- project:
+    name: vbd-nitrogen
+    jobs:
+      - '{project-name}-distribution-check-{stream}'
+      - odl-maven-jobs
+
+    stream: nitrogen
+    project: 'honeycomb/vbd'
+    project-name: 'vbd'
+    branch: 'stable/nitrogen'
     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-carbon
     jobs:
-      - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
-      - '{project-name}-merge-{stream}'
-      - '{project-name}-validate-autorelease-{stream}'
-      - '{project-name}-verify-{stream}-{maven}-{jdks}'
+      - odl-maven-jobs
 
-    stream: boron
+    stream: carbon
     project: 'honeycomb/vbd'
     project-name: 'vbd'
-    branch: 'stable/boron'
+    branch: 'stable/carbon'
     karaf-version: karaf3
-    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-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'