Merge "Move serviceutils Sonar scan to Sonarcloud"

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

diff --git a/jjb/odlparent/odlparent.yaml b/jjb/odlparent/odlparent.yaml
index 67ae76b96801d8f41fe16bedadfb66491684218d..f48a844967236d77f052ad24b8be42e214fea2b0 100644 (file)
--- a/jjb/odlparent/odlparent.yaml
+++ b/jjb/odlparent/odlparent.yaml
@@ -2,7 +2,8 @@
 - project:
     name: odlparent-master
     jobs:
-      - 'gerrit-release-merge'
+      - 'gerrit-release-merge':
+          build-node: centos7-builder-2c-2g
       - '{project-name}-rtd-jobs':
           build-node: centos7-builder-2c-2g
           doc-dir: .tox/docs/tmp/html
@@ -20,7 +21,7 @@
 
     java-version: 'openjdk11'
     mvn-settings: odlparent-settings
-    mvn-version: mvn35
+    mvn-version: mvn36
 
     dependencies: ''
     email-upstream: '[odlparent]'
@@ -101,36 +102,6 @@
     # Used by the release job
     staging-profile-id: 880d5ac25eaa
 
-- project:
-    name: odlparent-4.0.x
-    jobs:
-      - '{project-name}-maven-javadoc-jobs'
-      - odl-maven-jobs
-      - odl-maven-verify-jobs
-      - gerrit-tox-verify
-
-    project: odlparent
-    project-name: odlparent
-    stream: 4.0.x
-    branch: 4.0.x
-
-    mvn-settings: odlparent-settings
-    mvn-opts: '-Xmx1024m'
-
-    dependencies: ''
-    email-upstream: '[odlparent]'
-    archive-artifacts: >
-        **/*.prop
-        **/*.log
-        **/target/surefire-reports/*-output.txt
-        **/target/failsafe-reports/failsafe-summary.xml
-        **/hs_err_*.log
-        **/target/feature/feature.xml
-
-    # Used by the release job
-    javadoc-path: org.opendaylight.$PROJECT/$STREAM
-    staging-profile-id: 880d5ac25eaa
-
 - project:
     name: odlparent-sonar
     jobs:
@@ -145,6 +116,10 @@
     java-version: 'openjdk11'
     mvn-settings: 'odlparent-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: odlparent-view