Merge "Move p4plugin Sonar scan to Sonarcloud"

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

diff --git a/jjb/p4plugin/p4plugin.yaml b/jjb/p4plugin/p4plugin.yaml
index b9dad70127ac6c9b3dd403b2263c534fb47795d6..ae8f46da7af418168f19c3ce83c280177a27dd73 100644 (file)
--- a/jjb/p4plugin/p4plugin.yaml
+++ b/jjb/p4plugin/p4plugin.yaml
@@ -1,34 +1,18 @@
 ---
 - project:
-    name: p4plugin-sodium
+    name: p4plugin-aluminium
     jobs:
       - '{project-name}-maven-javadoc-jobs'
+      - gerrit-release-merge
       - odl-maven-jobs
+      - odl-maven-verify-jobs
 
-    stream: sodium
+    stream: aluminium
     project: 'p4plugin'
     project-name: 'p4plugin'
     branch: 'master'
     mvn-settings: 'p4plugin-settings'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    dependencies: ''
-    email-upstream: '[p4plugin]'
-
-    # Used by the release job
-    staging-profile-id: a68bf26e208d4
-
-- project:
-    name: p4plugin-neon
-    jobs:
-      - '{project-name}-maven-javadoc-jobs'
-      - odl-maven-jobs
-
-    stream: neon
-    project: 'p4plugin'
-    project-name: 'p4plugin'
-    branch: 'stable/neon'
-    mvn-settings: 'p4plugin-settings'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    mvn-opts: '-Xmx1024m'
     dependencies: ''
     email-upstream: '[p4plugin]'
 
@@ -36,17 +20,18 @@
     staging-profile-id: a68bf26e208d4
 
 - project:
-    name: p4plugin-fluorine
+    name: p4plugin-magnesium
     jobs:
       - '{project-name}-maven-javadoc-jobs'
       - odl-maven-jobs
+      - odl-maven-verify-jobs
 
-    stream: fluorine
+    stream: magnesium
     project: 'p4plugin'
     project-name: 'p4plugin'
-    branch: 'stable/fluorine'
+    branch: 'stable/magnesium'
     mvn-settings: 'p4plugin-settings'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    mvn-opts: '-Xmx1024m'
     dependencies: ''
     email-upstream: '[p4plugin]'
 
@@ -54,18 +39,18 @@
     staging-profile-id: a68bf26e208d4
 
 - project:
-    name: p4plugin-oxygen
+    name: p4plugin-sodium
     jobs:
-      - '{project-name}-distribution-check-{stream}'
       - '{project-name}-maven-javadoc-jobs'
       - odl-maven-jobs
+      - odl-maven-verify-jobs
 
-    stream: oxygen
+    stream: sodium
     project: 'p4plugin'
     project-name: 'p4plugin'
-    branch: 'stable/oxygen'
+    branch: 'stable/sodium'
     mvn-settings: 'p4plugin-settings'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    mvn-opts: '-Xmx1024m'
     dependencies: ''
     email-upstream: '[p4plugin]'
 
@@ -81,7 +66,20 @@
     project-name: 'p4plugin'
     branch: 'master'
     mvn-settings: 'p4plugin-settings'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    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: p4plugin-info
+    jobs:
+      - gerrit-info-yaml-verify
+    project: p4plugin
+    project-name: p4plugin
+    branch: master
+    build-node: centos7-builder-2c-1g
 
 - project:
     name: p4plugin-view