Merge "Move coe Sonar scan to Sonarcloud"

[releng/builder.git] / jjb / honeycomb / vbd / vbd.yaml

diff --git a/jjb/honeycomb/vbd/vbd.yaml b/jjb/honeycomb/vbd/vbd.yaml
index 68704e4835a6f8b6fedd8a03b3ca879f0f8e1137..2db27664efa1707454affc24aadc93940c901874 100644 (file)
--- a/jjb/honeycomb/vbd/vbd.yaml
+++ b/jjb/honeycomb/vbd/vbd.yaml
@@ -1,71 +1,16 @@
 ---
 - project:
-    name: vbd-aluminium
+    name: vbd-master
     jobs:
       - gerrit-release-merge
       - odl-maven-jobs
       - odl-maven-verify-jobs
 
-    stream: aluminium
+    stream: master
     project: 'honeycomb/vbd'
     project-name: 'vbd'
     branch: 'master'
     mvn-settings: 'honeycomb-vbd-settings'
-    mvn-opts: '-Xmx1024m'
-    dependencies: ''
-    email-upstream: '[vbd]'
-
-    # Used by the release job
-    staging-profile-id: 96fc362c36862
-
-- project:
-    name: vbd-magnesium
-    jobs:
-      - odl-maven-jobs
-      - odl-maven-verify-jobs
-
-    stream: magnesium
-    project: 'honeycomb/vbd'
-    project-name: 'vbd'
-    branch: 'stable/magnesium'
-    mvn-settings: 'honeycomb-vbd-settings'
-    mvn-opts: '-Xmx1024m'
-    dependencies: ''
-    email-upstream: '[vbd]'
-
-    # Used by the release job
-    staging-profile-id: 96fc362c36862
-
-- project:
-    name: vbd-sodium
-    jobs:
-      - odl-maven-jobs
-      - odl-maven-verify-jobs
-
-    stream: sodium
-    project: 'honeycomb/vbd'
-    project-name: 'vbd'
-    branch: 'stable/sodium'
-    mvn-settings: 'honeycomb-vbd-settings'
-    mvn-opts: '-Xmx1024m'
-    dependencies: ''
-    email-upstream: '[vbd]'
-
-    # Used by the release job
-    staging-profile-id: 96fc362c36862
-
-- project:
-    name: vbd-neon
-    jobs:
-      - odl-maven-jobs
-      - odl-maven-verify-jobs
-
-    stream: neon
-    project: 'honeycomb/vbd'
-    project-name: 'vbd'
-    branch: 'stable/neon'
-    mvn-settings: 'honeycomb-vbd-settings'
-    mvn-opts: '-Xmx1024m'
     dependencies: ''
     email-upstream: '[vbd]'
 
@@ -81,6 +26,19 @@
     branch: 'master'
     mvn-settings: 'honeycomb-vbd-settings'
     mvn-opts: '-Xmx1024m'
+    sonarcloud: true
+    sonarcloud-project-organization: '{sonarcloud_project_organization}'
+    sonarcloud-api-token: '{sonarcloud_api_token}'
+    sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
+
+- project:
+    name: vbd-info
+    jobs:
+      - gerrit-info-yaml-verify
+    project: honeycomb/vbd
+    project-name: vbd
+    branch: master
+    build-node: centos7-builder-2c-1g
 
 - project:
     name: vbd-view