X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fsxp%2Fsxp.yaml;h=1a0ece8d7a00e8e7092cc484a1e71d9152af83f4;hb=ded159bae784da2780f22422de2ad7a2584fecbf;hp=5f6c3bdddc812ffdf0b22dad06f19526f098af8e;hpb=a922381d030c5d57647f3412f77aee4c8479d458;p=releng%2Fbuilder.git

diff --git a/jjb/sxp/sxp.yaml b/jjb/sxp/sxp.yaml
index 5f6c3bddd..1a0ece8d7 100644
--- a/jjb/sxp/sxp.yaml
+++ b/jjb/sxp/sxp.yaml
@@ -1,6 +1,6 @@
 ---
 - project:
-    name: sxp-sodium
+    name: sxp-aluminium
     jobs:
       - '{project-name}-rtd-jobs':
           build-node: centos7-builder-2c-2g
@@ -8,18 +8,18 @@
           rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-sxp/47573/
           rtd-token: 4a78556e59ce3ef35e61e2fa19ebae049acf6d5d
       - odl-maven-jobs
+      - odl-maven-verify-jobs
+      - gerrit-release-merge
 
-    java-version:
-      - openjdk8
-      - openjdk11
+    java-version: 'openjdk11'
 
-    stream: sodium
+    stream: aluminium
     project: 'sxp'
     project-name: 'sxp'
     branch: 'master'
 
     mvn-settings: 'sxp-settings'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    mvn-opts: '-Xmx1024m'
 
     dependencies: 'odlparent-merge-{stream},controller-merge-{stream},yangtools-merge-{stream}'
     email-upstream: '[sxp] [odlparent] [controller] [yangtools]'
@@ -28,7 +28,7 @@
     staging-profile-id: a6909c75719b7
 
 - project:
-    name: sxp-neon
+    name: sxp-magnesium
     jobs:
       - '{project-name}-rtd-jobs':
           build-node: centos7-builder-2c-2g
@@ -36,18 +36,17 @@
           rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-sxp/47573/
           rtd-token: 4a78556e59ce3ef35e61e2fa19ebae049acf6d5d
       - odl-maven-jobs
+      - odl-maven-verify-jobs
 
-    java-version:
-      - openjdk8
-      - openjdk11
+    java-version: 'openjdk11'
 
-    stream: neon
+    stream: magnesium
     project: 'sxp'
     project-name: 'sxp'
-    branch: 'stable/neon'
+    branch: 'stable/magnesium'
 
     mvn-settings: 'sxp-settings'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    mvn-opts: '-Xmx1024m'
 
     dependencies: 'odlparent-merge-{stream},controller-merge-{stream},yangtools-merge-{stream}'
     email-upstream: '[sxp] [odlparent] [controller] [yangtools]'
@@ -56,7 +55,7 @@
     staging-profile-id: a6909c75719b7
 
 - project:
-    name: sxp-fluorine
+    name: sxp-sodium
     jobs:
       - '{project-name}-rtd-jobs':
           build-node: centos7-builder-2c-2g
@@ -64,36 +63,21 @@
           rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-sxp/47573/
           rtd-token: 4a78556e59ce3ef35e61e2fa19ebae049acf6d5d
       - odl-maven-jobs
+      - odl-maven-verify-jobs
 
-    stream: fluorine
-    project: 'sxp'
-    project-name: 'sxp'
-    branch: 'stable/fluorine'
-    mvn-settings: 'sxp-settings'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    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-oxygen
-    jobs:
-      - '{project-name}-distribution-check-{stream}'
-      - odl-maven-jobs
+    java-version:
+      - openjdk8
 
-    stream: oxygen
+    stream: sodium
     project: 'sxp'
     project-name: 'sxp'
-    branch: 'stable/oxygen'
+    branch: 'stable/sodium'
 
     mvn-settings: 'sxp-settings'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    mvn-opts: '-Xmx1024m'
 
     dependencies: 'odlparent-merge-{stream},controller-merge-{stream},yangtools-merge-{stream}'
     email-upstream: '[sxp] [odlparent] [controller] [yangtools]'
-    disable-job: true
 
     # Used by the release job
     staging-profile-id: a6909c75719b7
@@ -105,8 +89,13 @@
     project: 'sxp'
     project-name: 'sxp'
     branch: 'master'
+    java-version: 'openjdk11'
     mvn-settings: 'sxp-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: sxp-view