X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Ftelemetry%2Ftelemetry.yaml;h=7ed6c8c94c7a3340efd0d1da8b256e1b2a71f473;hb=55dc4436151692354f9080801ecaeb15ce6309ab;hp=914fec7d96d2da8a4be353f6def0d19a941f177f;hpb=807fca79b9cbd070495690797e1b0cc019caf5f9;p=releng%2Fbuilder.git

diff --git a/jjb/telemetry/telemetry.yaml b/jjb/telemetry/telemetry.yaml
index 914fec7d9..7ed6c8c94 100644
--- a/jjb/telemetry/telemetry.yaml
+++ b/jjb/telemetry/telemetry.yaml
@@ -1,100 +1,139 @@
 ---
 - project:
-    name: telemetry-sodium
+    name: telemetry-silicon
     jobs:
-      - 'odl-maven-jobs'
-      - '{project-name}-integration-{stream}'
-      - '{project-name}-rtd-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: sodium
-    project: 'telemetry'
-    project-name: 'telemetry'
-    branch: 'master'
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
-    mvn-settings: 'telemetry-settings'
-    mvn-goals: 'clean install'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    dependencies: ''
-    email-upstream: '[telemetry]'
-    archive-artifacts: ''
+    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-neon
+    name: telemetry-aluminium
     jobs:
-      - 'odl-maven-jobs'
-      - '{project-name}-integration-{stream}'
-      - '{project-name}-rtd-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: neon
-    project: 'telemetry'
-    project-name: 'telemetry'
-    branch: 'stable/neon'
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
-    mvn-settings: 'telemetry-settings'
-    mvn-goals: 'clean install'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    dependencies: ''
-    email-upstream: '[telemetry]'
-    archive-artifacts: ''
+    stream: aluminium
+    project: "telemetry"
+    project-name: "telemetry"
+    branch: "stable/aluminium"
+    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-fluorine
+    name: telemetry-magnesium
     jobs:
-      - 'odl-maven-jobs'
-      - '{project-name}-integration-{stream}'
-
-    stream: fluorine
-    project: 'telemetry'
-    project-name: 'telemetry'
-    branch: 'stable/fluorine'
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
-    mvn-settings: 'telemetry-settings'
-    mvn-goals: 'clean install'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    dependencies: ''
-    email-upstream: '[telemetry]'
-    archive-artifacts: ''
+      - "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: magnesium
+    project: "telemetry"
+    project-name: "telemetry"
+    branch: "stable/magnesium"
+    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-sodium
+    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: sodium
+    project: "telemetry"
+    project-name: "telemetry"
+    branch: "stable/sodium"
+    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-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:
       - gerrit-maven-sonar
 
-    project: 'telemetry'
-    project-name: 'telemetry'
-    branch: 'master'
-    mvn-settings: 'telemetry-settings'
-    mvn-goals: 'clean install'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    project: "telemetry"
+    project-name: "telemetry"
+    branch: "master"
+    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