Merge "Move unimgr Sonar scan to Sonarcloud"

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

diff --git a/jjb/netconf/netconf.yaml b/jjb/netconf/netconf.yaml
index d983fb0f9860dc7e4d9d91d2a959e9c33ecd0f12..5a79625e235e89ca5b825e7ca450f54377e73317 100644 (file)
--- a/jjb/netconf/netconf.yaml
+++ b/jjb/netconf/netconf.yaml
@@ -82,33 +82,6 @@
     # Used by the release job
     staging-profile-id: a67b22fc3663f
 
-- project:
-    name: netconf-neon
-    jobs:
-      - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-rtd-jobs':
-          build-node: centos7-builder-2c-2g
-          project-pattern: netconf
-          rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-netconf/48397/
-          rtd-token: aee2df909686ab7ba36f2ed08d90bdcf81f7b8dc
-      - odl-maven-jobs
-      - odl-maven-verify-jobs
-
-    stream: neon
-    project: 'netconf'
-    project-name: 'netconf'
-    branch: 'stable/neon'
-    build-node: centos7-builder-2c-8g
-    mvn-settings: 'netconf-settings'
-    mvn-goals: 'clean deploy -Pintegrationtests'
-    mvn-opts: '-Xmx2048m -Dmaven.compile.fork=true'
-    build-timeout: 90
-    dependencies: 'aaa-merge-{stream},controller-merge-{stream},odlparent-merge-{stream},yangtools-merge-{stream}'
-    email-upstream: '[netconf] [aaa] [controller] [odlparent] [yangtools]'
-
-    # Used by the release job
-    staging-profile-id: a67b22fc3663f
-
 - project:
     name: netconf-sonar
     jobs:
@@ -126,6 +99,19 @@
     mvn-goals: 'clean deploy -Pintegrationtests'
     mvn-opts: '-Xmx2048m -Dmaven.compile.fork=true'
     build-timeout: 90
+    sonarcloud: true
+    sonarcloud-project-organization: '{sonarcloud_project_organization}'
+    sonarcloud-api-token: '{sonarcloud_api_token}'
+    sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
+
+- project:
+    name: netconf-info
+    jobs:
+      - gerrit-info-yaml-verify
+    project: netconf
+    project-name: netconf
+    branch: master
+    build-node: centos7-builder-2c-1g
 
 - project:
     name: netconf-view