Merge "Move archetypes Sonar scan to Sonarcloud"

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

diff --git a/jjb/plastic/plastic.yaml b/jjb/plastic/plastic.yaml
index b3f5132adbcaf138b10c8045acf3a02043b90efb..f77719b9bf027430d1a3fbdc1d08c29411cee062 100644 (file)
--- a/jjb/plastic/plastic.yaml
+++ b/jjb/plastic/plastic.yaml
@@ -25,32 +25,29 @@
     staging-profile-id: 380d129f253e1
 
 - project:
-    name: plastic-2.1.6
+    name: plastic-sonar
     jobs:
-      - odl-maven-jobs
+      - gerrit-maven-sonar
 
-    stream: 2.1.6
     project: plastic
     project-name: plastic
-    branch: 2.1.6
+    branch: master
     java-version: openjdk8
     mvn-settings: plastic-settings
     mvn-opts: '-Xmx1024m'
-
-    # Used by the release job
-    staging-profile-id: 380d129f253e1
+    sonarcloud: true
+    sonarcloud-project-organization: '{sonarcloud_project_organization}'
+    sonarcloud-api-token: '{sonarcloud_api_token}'
+    sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
 
 - project:
-    name: plastic-sonar
+    name: plastic-info
     jobs:
-      - gerrit-maven-sonar
-
+      - gerrit-info-yaml-verify
     project: plastic
     project-name: plastic
     branch: master
-    java-version: openjdk8
-    mvn-settings: plastic-settings
-    mvn-opts: '-Xmx1024m'
+    build-node: centos7-builder-2c-1g
 
 - project:
     name: plastic-view