Merge "Move unimgr Sonar scan to Sonarcloud"

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

diff --git a/jjb/serviceutils/serviceutils.yaml b/jjb/serviceutils/serviceutils.yaml
index c726ad13d1d32aac28c80182dfa5977af71a5fec..0a9cbf91d7e82cff9fc45805bdc274cfae1f8858 100644 (file)
--- a/jjb/serviceutils/serviceutils.yaml
+++ b/jjb/serviceutils/serviceutils.yaml
@@ -97,38 +97,6 @@
     # Used by the release job
     staging-profile-id: 12cc4ba8bf01ba
 
-- project:
-    name: serviceutils-neon
-    jobs:
-      - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-maven-javadoc-jobs'
-      - '{project-name}-rtd-jobs':
-          build-node: centos7-builder-2c-2g
-          project-pattern: serviceutils
-          rtd-build-url: https://readthedocs.org/api/v2/webhook/opendaylight-serviceutils/40541/
-          rtd-token: 866f76be38ed7efc7027b9c52e7ad869e523e7c4
-      - odl-maven-jobs
-      - odl-maven-verify-jobs
-
-    branch: 'stable/neon'
-    stream: neon
-
-    project: 'serviceutils'
-    project-name: 'serviceutils'
-    build-node: centos7-builder-2c-2g
-    mvn-settings: 'serviceutils-settings'
-    mvn-opts: '-Xmx1024m'
-    build-timeout: 90
-    dependencies: >
-        controller-merge-{stream},
-        yangtools-merge-{stream},
-        odlparent-merge-{stream},
-        infrautils-merge-{stream}
-    email-upstream: '[serviceutils] [controller] [yangtools] [odlparent] [infrautils]'
-
-    # Used by the release job
-    staging-profile-id: 12cc4ba8bf01ba
-
 - project:
     name: serviceutils-sonar
     jobs:
@@ -141,6 +109,19 @@
     java-version: 'openjdk11'
     mvn-settings: 'serviceutils-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: serviceutils-info
+    jobs:
+      - gerrit-info-yaml-verify
+    project: serviceutils
+    project-name: serviceutils
+    branch: master
+    build-node: centos7-builder-2c-1g
 
 - project:
     name: serviceutils-view