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 7fd08fdf3420ce9c1c28050059c161b33367696c..97853860cca4a8c1d934f3a3a3da52579f31c8b8 100644 (file)
--- a/jjb/telemetry/telemetry.yaml
+++ b/jjb/telemetry/telemetry.yaml
@@ -1,6 +1,6 @@
 ---
 - project:
-    name: telemetry-aluminium
+    name: telemetry-silicon
     jobs:
       - 'odl-maven-jobs'
       - odl-maven-verify-jobs
@@ -10,9 +10,8 @@
           project-pattern: telemetry
           rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-telemetry/57583/
           rtd-token: 694bcbf8e0b45b3c4e53174c6e5773ca351e1efb
-      - gerrit-release-merge
 
-    stream: aluminium
+    stream: silicon
     project: 'telemetry'
     project-name: 'telemetry'
     branch: 'master'
@@ -26,7 +25,7 @@
     staging-profile-id: 8ed9c52266504
 
 - project:
-    name: telemetry-magnesium
+    name: telemetry-aluminium
     jobs:
       - 'odl-maven-jobs'
       - odl-maven-verify-jobs
@@ -37,10 +36,10 @@
           rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-telemetry/57583/
           rtd-token: 694bcbf8e0b45b3c4e53174c6e5773ca351e1efb
 
-    stream: magnesium
+    stream: aluminium
     project: 'telemetry'
     project-name: 'telemetry'
-    branch: 'stable/magnesium'
+    branch: 'stable/aluminium'
     mvn-settings: 'telemetry-settings'
     mvn-opts: '-Xmx1024m'
     dependencies: ''
@@ -51,7 +50,7 @@
     staging-profile-id: 8ed9c52266504
 
 - project:
-    name: telemetry-sodium
+    name: telemetry-magnesium
     jobs:
       - 'odl-maven-jobs'
       - odl-maven-verify-jobs
@@ -62,10 +61,10 @@
           rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-telemetry/57583/
           rtd-token: 694bcbf8e0b45b3c4e53174c6e5773ca351e1efb
 
-    stream: sodium
+    stream: magnesium
     project: 'telemetry'
     project-name: 'telemetry'
-    branch: 'stable/sodium'
+    branch: 'stable/magnesium'
     mvn-settings: 'telemetry-settings'
     mvn-opts: '-Xmx1024m'
     dependencies: ''
@@ -76,7 +75,7 @@
     staging-profile-id: 8ed9c52266504
 
 - project:
-    name: telemetry-neon
+    name: telemetry-sodium
     jobs:
       - 'odl-maven-jobs'
       - odl-maven-verify-jobs
@@ -87,10 +86,10 @@
           rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-telemetry/57583/
           rtd-token: 694bcbf8e0b45b3c4e53174c6e5773ca351e1efb
 
-    stream: neon
+    stream: sodium
     project: 'telemetry'
     project-name: 'telemetry'
-    branch: 'stable/neon'
+    branch: 'stable/sodium'
     mvn-settings: 'telemetry-settings'
     mvn-opts: '-Xmx1024m'
     dependencies: ''
@@ -100,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:
@@ -111,6 +121,19 @@
     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
+    jobs:
+      - gerrit-info-yaml-verify
+    project: telemetry
+    project-name: telemetry
+    branch: master
+    build-node: centos7-builder-2c-1g
 
 - project:
     name: telemetry-view