Merge "Update global-jjb to v0.49.0"

[releng/builder.git] / jjb / sxp / sxp.yaml

diff --git a/jjb/sxp/sxp.yaml b/jjb/sxp/sxp.yaml
index 34288d0f4e061d64c74bf6b5d4bf8aab2c8bdf44..1bfd5310201a708d19480dfafad9566ef1193ac9 100644 (file)
--- a/jjb/sxp/sxp.yaml
+++ b/jjb/sxp/sxp.yaml
@@ -11,9 +11,7 @@
       - odl-maven-verify-jobs
       - gerrit-release-merge
 
-    java-version:
-      - openjdk8
-      - openjdk11
+    java-version: 'openjdk11'
 
     stream: magnesium
     project: 'sxp'
@@ -21,7 +19,7 @@
     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]'
@@ -42,7 +40,6 @@
 
     java-version:
       - openjdk8
-      - openjdk11
 
     stream: sodium
     project: 'sxp'
@@ -50,7 +47,7 @@
     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]'
@@ -71,7 +68,6 @@
 
     java-version:
       - openjdk8
-      - openjdk11
 
     stream: neon
     project: 'sxp'
@@ -79,31 +75,8 @@
     branch: 'stable/neon'
 
     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]'
 
@@ -117,8 +90,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