Merge "Move netvirt Sonar scan to Sonarcloud"

[releng/builder.git] / jjb / usc / usc.yaml

diff --git a/jjb/usc/usc.yaml b/jjb/usc/usc.yaml
index eddcf409ed9d706095f99f9290e306164228a8bf..9a93d7571a1bb7f00ba399506cd9ddd5f287c391 100644 (file)
--- a/jjb/usc/usc.yaml
+++ b/jjb/usc/usc.yaml
@@ -57,25 +57,6 @@
     # Used by the release job
     staging-profile-id: a697b633b3ffe
 
-- project:
-    name: usc-neon
-    jobs:
-      - '{project-name}-maven-javadoc-jobs'
-      - odl-maven-jobs
-      - odl-maven-verify-jobs
-
-    stream: neon
-    project: 'usc'
-    project-name: 'usc'
-    branch: 'stable/neon'
-    mvn-settings: 'usc-settings'
-    mvn-opts: '-Xmx1024m'
-    dependencies: 'controller-merge-{stream},yangtools-merge-{stream},odlparent-merge-{stream}'
-    email-upstream: '[usc] [controller] [yangtools] [odlparent]'
-
-    # Used by the release job
-    staging-profile-id: a697b633b3ffe
-
 - project:
     name: usc-sonar
     jobs:
@@ -86,6 +67,19 @@
     branch: 'master'
     mvn-settings: 'usc-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: usc-info
+    jobs:
+      - gerrit-info-yaml-verify
+    project: usc
+    project-name: usc
+    branch: master
+    build-node: centos7-builder-2c-1g
 
 - project:
     name: usc-view