X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Ftsdr%2Ftsdr.yaml;h=a2312ba86e74dd22bac02a3308c619e847d82431;hb=5102e39ad035be2409ce11d59605921a58646308;hp=5d6fa15bac8f000283946ca20fd94c03deaaede4;hpb=7d48177bafbb4c3beb042da423f77bfbc912364c;p=releng%2Fbuilder.git

diff --git a/jjb/tsdr/tsdr.yaml b/jjb/tsdr/tsdr.yaml
index 5d6fa15ba..a2312ba86 100644
--- a/jjb/tsdr/tsdr.yaml
+++ b/jjb/tsdr/tsdr.yaml
@@ -1,6 +1,6 @@
 ---
 - project:
-    name: tsdr-sodium
+    name: tsdr-silicon
     jobs:
       - '{project-name}-rtd-jobs':
           build-node: centos7-builder-2c-2g
@@ -8,13 +8,14 @@
           rtd-build-url: https://readthedocs.org/api/v2/webhook/opendaylight-tsdr/47532/
           rtd-token: 96c97641155132afcc5900bafc68af3364d91c99
       - odl-maven-jobs
+      - odl-maven-verify-jobs
 
-    stream: sodium
+    stream: silicon
     project: 'tsdr'
     project-name: 'tsdr'
     branch: 'master'
     mvn-settings: 'tsdr-settings'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    mvn-opts: '-Xmx1024m'
     dependencies: ''
     email-upstream: '[tsdr]'
 
@@ -22,7 +23,7 @@
     staging-profile-id: a69373036303c
 
 - project:
-    name: tsdr-neon
+    name: tsdr-aluminium
     jobs:
       - '{project-name}-rtd-jobs':
           build-node: centos7-builder-2c-2g
@@ -30,13 +31,14 @@
           rtd-build-url: https://readthedocs.org/api/v2/webhook/opendaylight-tsdr/47532/
           rtd-token: 96c97641155132afcc5900bafc68af3364d91c99
       - odl-maven-jobs
+      - odl-maven-verify-jobs
 
-    stream: neon
+    stream: aluminium
     project: 'tsdr'
     project-name: 'tsdr'
-    branch: 'stable/neon'
+    branch: 'stable/aluminium'
     mvn-settings: 'tsdr-settings'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    mvn-opts: '-Xmx1024m'
     dependencies: ''
     email-upstream: '[tsdr]'
 
@@ -44,7 +46,7 @@
     staging-profile-id: a69373036303c
 
 - project:
-    name: tsdr-fluorine
+    name: tsdr-magnesium
     jobs:
       - '{project-name}-rtd-jobs':
           build-node: centos7-builder-2c-2g
@@ -52,13 +54,14 @@
           rtd-build-url: https://readthedocs.org/api/v2/webhook/opendaylight-tsdr/47532/
           rtd-token: 96c97641155132afcc5900bafc68af3364d91c99
       - odl-maven-jobs
+      - odl-maven-verify-jobs
 
-    stream: fluorine
+    stream: magnesium
     project: 'tsdr'
     project-name: 'tsdr'
-    branch: 'stable/fluorine'
+    branch: 'stable/magnesium'
     mvn-settings: 'tsdr-settings'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    mvn-opts: '-Xmx1024m'
     dependencies: ''
     email-upstream: '[tsdr]'
 
@@ -66,24 +69,39 @@
     staging-profile-id: a69373036303c
 
 - project:
-    name: tsdr-oxygen
+    name: tsdr-sodium
     jobs:
-      - '{project-name}-distribution-check-{stream}'
+      - '{project-name}-rtd-jobs':
+          build-node: centos7-builder-2c-2g
+          project-pattern: tsdr
+          rtd-build-url: https://readthedocs.org/api/v2/webhook/opendaylight-tsdr/47532/
+          rtd-token: 96c97641155132afcc5900bafc68af3364d91c99
       - odl-maven-jobs
+      - odl-maven-verify-jobs
 
-    stream: oxygen
+    stream: sodium
     project: 'tsdr'
     project-name: 'tsdr'
-    branch: 'stable/oxygen'
+    branch: 'stable/sodium'
     mvn-settings: 'tsdr-settings'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    mvn-opts: '-Xmx1024m'
     dependencies: ''
     email-upstream: '[tsdr]'
-    disable-job: true
 
     # Used by the release job
     staging-profile-id: a69373036303c
 
+- project:
+    name: tsdr-release-management
+    jobs:
+      - gerrit-release-merge
+
+    project: tsdr
+    project-name: tsdr
+
+    build-node: centos7-builder-2c-1g
+    mvn-settings: tsdr-settings
+
 - project:
     name: tsdr-sonar
     jobs:
@@ -92,7 +110,20 @@
     project-name: 'tsdr'
     branch: 'master'
     mvn-settings: 'tsdr-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: tsdr-info
+    jobs:
+      - gerrit-info-yaml-verify
+    project: tsdr
+    project-name: tsdr
+    branch: master
+    build-node: centos7-builder-2c-1g
 
 - project:
     name: tsdr-view