Merge "Move unimgr Sonar scan to Sonarcloud"

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

diff --git a/jjb/sfc/sfc.yaml b/jjb/sfc/sfc.yaml
index c46aca90d66b53fbe2b40ab04bb231eee1a37fbd..2e46db2a40acf44527a10a92c5edb610362c3523 100644 (file)
--- a/jjb/sfc/sfc.yaml
+++ b/jjb/sfc/sfc.yaml
@@ -77,32 +77,6 @@
     # Used by the release job
     staging-profile-id: a68eb361ca48a
 
-- project:
-    name: sfc-neon
-    jobs:
-      - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-rtd-jobs':
-          build-node: centos7-builder-2c-2g
-          project-pattern: sfc
-          rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-sfc/38996/
-          rtd-token: 2fa6c2900bbe181b0427ad65df3dc494ac749edb
-      - odl-maven-jobs
-      - odl-maven-verify-jobs
-
-    stream: neon
-    project: 'sfc'
-    project-name: 'sfc'
-    branch: 'stable/neon'
-    mvn-settings: 'sfc-settings'
-    mvn-opts: '-Xmx2048m -Dmaven.compile.fork=true'
-    build-timeout: 120
-    dependencies: 'openflowplugin-merge-{stream},ovsdb-merge-{stream},lispflowmapping-merge-{stream}'
-    email-upstream: '[sfc] [openflowplugin] [ovsdb] [lispflowmapping]'
-    build-node: centos7-builder-8c-8g
-
-    # Used by the release job
-    staging-profile-id: a68eb361ca48a
-
 - project:
     name: sfc-sonar
     jobs:
@@ -113,6 +87,19 @@
     java-version: 'openjdk11'
     mvn-settings: 'sfc-settings'
     mvn-opts: '-Xmx2048m -Dmaven.compile.fork=true'
+    sonarcloud: true
+    sonarcloud-project-organization: '{sonarcloud_project_organization}'
+    sonarcloud-api-token: '{sonarcloud_api_token}'
+    sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
+
+- project:
+    name: sfc-info
+    jobs:
+      - gerrit-info-yaml-verify
+    project: sfc
+    project-name: sfc
+    branch: master
+    build-node: centos7-builder-2c-1g
 
 - project:
     name: sfc-view