Split out release-merge job to separate project

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

diff --git a/jjb/p4plugin/p4plugin.yaml b/jjb/p4plugin/p4plugin.yaml
index 71f140121393b2ce034c1bd6dec2a6c99e7fb3f0..3c3f50a80563fd856577287590b1c175c7faf8da 100644 (file)
--- a/jjb/p4plugin/p4plugin.yaml
+++ b/jjb/p4plugin/p4plugin.yaml
@@ -1,16 +1,34 @@
 ---
+- project:
+    name: p4plugin-silicon
+    jobs:
+      - '{project-name}-maven-javadoc-jobs'
+      - odl-maven-jobs
+      - odl-maven-verify-jobs
+
+    stream: silicon
+    project: 'p4plugin'
+    project-name: 'p4plugin'
+    branch: 'master'
+    mvn-settings: 'p4plugin-settings'
+    mvn-opts: '-Xmx1024m'
+    dependencies: ''
+    email-upstream: '[p4plugin]'
+
+    # Used by the release job
+    staging-profile-id: a68bf26e208d4
+
 - project:
     name: p4plugin-aluminium
     jobs:
       - '{project-name}-maven-javadoc-jobs'
-      - gerrit-release-merge
       - odl-maven-jobs
       - odl-maven-verify-jobs
 
     stream: aluminium
     project: 'p4plugin'
     project-name: 'p4plugin'
-    branch: 'master'
+    branch: 'stable/aluminium'
     mvn-settings: 'p4plugin-settings'
     mvn-opts: '-Xmx1024m'
     dependencies: ''
@@ -57,6 +75,17 @@
     # Used by the release job
     staging-profile-id: a68bf26e208d4
 
+- project:
+    name: p4plugin-release-management
+    jobs:
+      - gerrit-release-merge
+
+    project: p4plugin
+    project-name: p4plugin
+
+    build-node: centos7-builder-2c-1g
+    mvn-settings: p4plugin-settings
+
 - project:
     name: p4plugin-sonar
     jobs:
@@ -67,6 +96,10 @@
     branch: 'master'
     mvn-settings: 'p4plugin-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: p4plugin-info