X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fsxp%2Fsxp.yaml;h=522964425327e0c089205fee130d526d4f851a27;hb=c28fbd5ac959e5988af9688b5d447fb2eb841126;hp=0316e6ed156e4c54c0f4c35436a03af5dd50dc3b;hpb=2be5a4fb6ae1de3f36dacf59a90d4ece73c671f9;p=releng%2Fbuilder.git

diff --git a/jjb/sxp/sxp.yaml b/jjb/sxp/sxp.yaml
index 0316e6ed1..522964425 100644
--- a/jjb/sxp/sxp.yaml
+++ b/jjb/sxp/sxp.yaml
@@ -1,6 +1,6 @@
 ---
 - project:
-    name: sxp-magnesium
+    name: sxp-silicon
     jobs:
       - '{project-name}-rtd-jobs':
           build-node: centos7-builder-2c-2g
@@ -9,12 +9,10 @@
           rtd-token: 4a78556e59ce3ef35e61e2fa19ebae049acf6d5d
       - odl-maven-jobs
       - odl-maven-verify-jobs
-      - gerrit-release-merge
 
-    java-version:
-      - openjdk11
+    java-version: 'openjdk11'
 
-    stream: magnesium
+    stream: silicon
     project: 'sxp'
     project-name: 'sxp'
     branch: 'master'
@@ -29,7 +27,7 @@
     staging-profile-id: a6909c75719b7
 
 - project:
-    name: sxp-sodium
+    name: sxp-aluminium
     jobs:
       - '{project-name}-rtd-jobs':
           build-node: centos7-builder-2c-2g
@@ -39,13 +37,39 @@
       - odl-maven-jobs
       - odl-maven-verify-jobs
 
-    java-version:
-      - openjdk8
+    java-version: 'openjdk11'
 
-    stream: sodium
+    stream: aluminium
     project: 'sxp'
     project-name: 'sxp'
-    branch: 'stable/sodium'
+    branch: 'stable/aluminium'
+
+    mvn-settings: 'sxp-settings'
+    mvn-opts: '-Xmx1024m'
+
+    dependencies: 'odlparent-merge-{stream},controller-merge-{stream},yangtools-merge-{stream}'
+    email-upstream: '[sxp] [odlparent] [controller] [yangtools]'
+
+    # Used by the release job
+    staging-profile-id: a6909c75719b7
+
+- project:
+    name: sxp-magnesium
+    jobs:
+      - '{project-name}-rtd-jobs':
+          build-node: centos7-builder-2c-2g
+          project-pattern: sxp
+          rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-sxp/47573/
+          rtd-token: 4a78556e59ce3ef35e61e2fa19ebae049acf6d5d
+      - odl-maven-jobs
+      - odl-maven-verify-jobs
+
+    java-version: 'openjdk11'
+
+    stream: magnesium
+    project: 'sxp'
+    project-name: 'sxp'
+    branch: 'stable/magnesium'
 
     mvn-settings: 'sxp-settings'
     mvn-opts: '-Xmx1024m'
@@ -57,7 +81,7 @@
     staging-profile-id: a6909c75719b7
 
 - project:
-    name: sxp-neon
+    name: sxp-sodium
     jobs:
       - '{project-name}-rtd-jobs':
           build-node: centos7-builder-2c-2g
@@ -70,10 +94,10 @@
     java-version:
       - openjdk8
 
-    stream: neon
+    stream: sodium
     project: 'sxp'
     project-name: 'sxp'
-    branch: 'stable/neon'
+    branch: 'stable/sodium'
 
     mvn-settings: 'sxp-settings'
     mvn-opts: '-Xmx1024m'
@@ -84,6 +108,17 @@
     # Used by the release job
     staging-profile-id: a6909c75719b7
 
+- project:
+    name: sxp-release-management
+    jobs:
+      - gerrit-release-merge
+
+    project: sxp
+    project-name: sxp
+
+    build-node: centos7-builder-2c-1g
+    mvn-settings: sxp-settings
+
 - project:
     name: sxp-sonar
     jobs:
@@ -91,8 +126,22 @@
     project: 'sxp'
     project-name: 'sxp'
     branch: 'master'
+    java-version: 'openjdk11'
     mvn-settings: 'sxp-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: sxp-info
+    jobs:
+      - gerrit-info-yaml-verify
+    project: sxp
+    project-name: sxp
+    branch: master
+    build-node: centos7-builder-2c-1g
 
 - project:
     name: sxp-view