X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fsxp%2Fsxp.yaml;h=a19648c5216ad8b65cb15d1b43870a7364b03d46;hb=74d14c7b7904922061e1dafe7482438521aae6f7;hp=a85b4f109bb2f5f435891adc51182ecad5bba3e9;hpb=46dea4fdcdd4008d2b44d301376984729d181f51;p=releng%2Fbuilder.git

diff --git a/jjb/sxp/sxp.yaml b/jjb/sxp/sxp.yaml
index a85b4f109..a19648c52 100644
--- a/jjb/sxp/sxp.yaml
+++ b/jjb/sxp/sxp.yaml
@@ -1,6 +1,6 @@
 ---
 - project:
-    name: sxp-magnesium
+    name: sxp-aluminium
     jobs:
       - '{project-name}-rtd-jobs':
           build-node: centos7-builder-2c-2g
@@ -11,16 +11,15 @@
       - odl-maven-verify-jobs
       - gerrit-release-merge
 
-    java-version:
-      - openjdk11
+    java-version: 'openjdk11'
 
-    stream: magnesium
+    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]'
@@ -29,7 +28,7 @@
     staging-profile-id: a6909c75719b7
 
 - project:
-    name: sxp-sodium
+    name: sxp-magnesium
     jobs:
       - '{project-name}-rtd-jobs':
           build-node: centos7-builder-2c-2g
@@ -39,16 +38,15 @@
       - odl-maven-jobs
       - odl-maven-verify-jobs
 
-    java-version:
-      - openjdk8
+    java-version: 'openjdk11'
 
-    stream: sodium
+    stream: magnesium
     project: 'sxp'
     project-name: 'sxp'
-    branch: 'stable/sodium'
+    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]'
@@ -57,7 +55,7 @@
     staging-profile-id: a6909c75719b7
 
 - project:
-    name: sxp-neon
+    name: sxp-sodium
     jobs:
       - '{project-name}-rtd-jobs':
           build-node: centos7-builder-2c-2g
@@ -70,37 +68,14 @@
     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 -XX:MaxPermSize=256m'
-
-    dependencies: 'odlparent-merge-{stream},controller-merge-{stream},yangtools-merge-{stream}'
-    email-upstream: '[sxp] [odlparent] [controller] [yangtools]'
+    mvn-opts: '-Xmx1024m'
 
-    # Used by the release job
-    staging-profile-id: a6909c75719b7
-
-- project:
-    name: sxp-fluorine
-    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
-
-    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]'
 
@@ -114,8 +89,9 @@
     project: 'sxp'
     project-name: 'sxp'
     branch: 'master'
+    java-version: 'openjdk11'
     mvn-settings: 'sxp-settings'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    mvn-opts: '-Xmx1024m'
 
 - project:
     name: sxp-view