Merge "Upgrade OVS dep for opflex from 2.6.7 to 2.12.0"

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

diff --git a/jjb/sfc/sfc.yaml b/jjb/sfc/sfc.yaml
index cd9e992288c599f1024d5f6af937aaf9f5c99d27..7d539580df00ec66eb3747be242f0994dde73f59 100644 (file)
--- a/jjb/sfc/sfc.yaml
+++ b/jjb/sfc/sfc.yaml
@@ -1,6 +1,6 @@
 ---
 - project:
-    name: sfc-sodium
+    name: sfc-magnesium
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-rtd-jobs':
@@ -8,14 +8,16 @@
           project-pattern: sfc
           rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-sfc/38996/
           rtd-token: 2fa6c2900bbe181b0427ad65df3dc494ac749edb
-      - odl-maven-jobs
+      - odl-maven-jobs-jdk11
+      - odl-maven-verify-jobs
 
-    stream: sodium
+    stream: magnesium
     project: 'sfc'
     project-name: 'sfc'
     branch: 'master'
+    java-version: 'openjdk11'
     mvn-settings: 'sfc-settings'
-    mvn-opts: '-Xmx2048m -XX:MaxPermSize=256m -Dmaven.compile.fork=true'
+    mvn-opts: '-Xmx2048m -Dmaven.compile.fork=true'
     build-timeout: 120
     dependencies: 'openflowplugin-merge-{stream},ovsdb-merge-{stream},lispflowmapping-merge-{stream}'
     email-upstream: '[sfc] [openflowplugin] [ovsdb] [lispflowmapping]'
@@ -25,7 +27,7 @@
     staging-profile-id: a68eb361ca48a
 
 - project:
-    name: sfc-neon
+    name: sfc-sodium
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-rtd-jobs':
@@ -34,13 +36,14 @@
           rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-sfc/38996/
           rtd-token: 2fa6c2900bbe181b0427ad65df3dc494ac749edb
       - odl-maven-jobs
+      - odl-maven-verify-jobs
 
-    stream: neon
+    stream: sodium
     project: 'sfc'
     project-name: 'sfc'
-    branch: 'stable/neon'
+    branch: 'stable/sodium'
     mvn-settings: 'sfc-settings'
-    mvn-opts: '-Xmx2048m -XX:MaxPermSize=256m -Dmaven.compile.fork=true'
+    mvn-opts: '-Xmx2048m -Dmaven.compile.fork=true'
     build-timeout: 120
     dependencies: 'openflowplugin-merge-{stream},ovsdb-merge-{stream},lispflowmapping-merge-{stream}'
     email-upstream: '[sfc] [openflowplugin] [ovsdb] [lispflowmapping]'
@@ -50,7 +53,7 @@
     staging-profile-id: a68eb361ca48a
 
 - project:
-    name: sfc-fluorine
+    name: sfc-neon
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-rtd-jobs':
@@ -59,13 +62,14 @@
           rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-sfc/38996/
           rtd-token: 2fa6c2900bbe181b0427ad65df3dc494ac749edb
       - odl-maven-jobs
+      - odl-maven-verify-jobs
 
-    stream: fluorine
+    stream: neon
     project: 'sfc'
     project-name: 'sfc'
-    branch: 'stable/fluorine'
+    branch: 'stable/neon'
     mvn-settings: 'sfc-settings'
-    mvn-opts: '-Xmx2048m -XX:MaxPermSize=256m -Dmaven.compile.fork=true'
+    mvn-opts: '-Xmx2048m -Dmaven.compile.fork=true'
     build-timeout: 120
     dependencies: 'openflowplugin-merge-{stream},ovsdb-merge-{stream},lispflowmapping-merge-{stream}'
     email-upstream: '[sfc] [openflowplugin] [ovsdb] [lispflowmapping]'
@@ -81,8 +85,9 @@
     project: 'sfc'
     project-name: 'sfc'
     branch: 'master'
+    java-version: 'openjdk11'
     mvn-settings: 'sfc-settings'
-    mvn-opts: '-Xmx2048m -XX:MaxPermSize=256m -Dmaven.compile.fork=true'
+    mvn-opts: '-Xmx2048m -Dmaven.compile.fork=true'
 
 - project:
     name: sfc-view