Split out release-merge job to separate project

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

diff --git a/jjb/telemetry/telemetry.yaml b/jjb/telemetry/telemetry.yaml
index ad3e6fa0b64d973d110d6a91621a044ebb7ee51e..97853860cca4a8c1d934f3a3a3da52579f31c8b8 100644 (file)
--- a/jjb/telemetry/telemetry.yaml
+++ b/jjb/telemetry/telemetry.yaml
@@ -1,4 +1,29 @@
 ---
+- project:
+    name: telemetry-silicon
+    jobs:
+      - 'odl-maven-jobs'
+      - odl-maven-verify-jobs
+      - '{project-name}-integration-{stream}'
+      - '{project-name}-rtd-jobs':
+          build-node: centos7-builder-2c-2g
+          project-pattern: telemetry
+          rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-telemetry/57583/
+          rtd-token: 694bcbf8e0b45b3c4e53174c6e5773ca351e1efb
+
+    stream: silicon
+    project: 'telemetry'
+    project-name: 'telemetry'
+    branch: 'master'
+    mvn-settings: 'telemetry-settings'
+    mvn-opts: '-Xmx1024m'
+    dependencies: ''
+    email-upstream: '[telemetry]'
+    archive-artifacts: ''
+
+    # Used by the release job
+    staging-profile-id: 8ed9c52266504
+
 - project:
     name: telemetry-aluminium
     jobs:
@@ -10,12 +35,11 @@
           project-pattern: telemetry
           rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-telemetry/57583/
           rtd-token: 694bcbf8e0b45b3c4e53174c6e5773ca351e1efb
-      - gerrit-release-merge
 
     stream: aluminium
     project: 'telemetry'
     project-name: 'telemetry'
-    branch: 'master'
+    branch: 'stable/aluminium'
     mvn-settings: 'telemetry-settings'
     mvn-opts: '-Xmx1024m'
     dependencies: ''
@@ -75,6 +99,17 @@
     # Used by the release job
     staging-profile-id: 8ed9c52266504
 
+- project:
+    name: telemetry-release-management
+    jobs:
+      - gerrit-release-merge
+
+    project: telemetry
+    project-name: telemetry
+
+    build-node: centos7-builder-2c-1g
+    mvn-settings: telemetry-settings
+
 - project:
     name: telemetry-sonar
     jobs:
@@ -86,6 +121,10 @@
     mvn-settings: 'telemetry-settings'
     mvn-goals: 'clean install'
     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: telemetry-info