Merge "Remove all Neon jobs"

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

diff --git a/jjb/openflowplugin/openflowplugin.yaml b/jjb/openflowplugin/openflowplugin.yaml
index 9831cece446eebf52a42a590451a825421395f6f..d6e473db8eec1b11358b5b816e1c18d0c4733c42 100644 (file)
--- a/jjb/openflowplugin/openflowplugin.yaml
+++ b/jjb/openflowplugin/openflowplugin.yaml
@@ -1,6 +1,6 @@
 ---
 - project:
-    name: openflowplugin-magnesium
+    name: openflowplugin-aluminium
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-maven-javadoc-jobs'
@@ -16,7 +16,7 @@
     csit-gate-list: 'netvirt-csit-1node-0cmb-1ctl-2cmp-apex-queens-gate-snat-conntrack-{stream}'
     block_on_csit: false
 
-    stream: magnesium
+    stream: aluminium
     project: 'openflowplugin'
     project-name: 'openflowplugin'
     branch: 'master'
@@ -37,7 +37,7 @@
     staging-profile-id: a68a76dc1b44c
 
 - project:
-    name: openflowplugin-sodium
+    name: openflowplugin-magnesium
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-maven-javadoc-jobs'
@@ -47,18 +47,19 @@
           project-pattern: openflowplugin
           rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-openflowplugin/38994/
           rtd-token: 86ce095922558b890c61b1b05d682521d1d66d5f
-      - odl-maven-jobs
+      - odl-maven-jobs-jdk11
       - odl-maven-verify-jobs
 
     csit-gate-list: 'netvirt-csit-1node-0cmb-1ctl-2cmp-apex-queens-gate-snat-conntrack-{stream}'
     block_on_csit: false
 
-    stream: sodium
+    stream: magnesium
     project: 'openflowplugin'
     project-name: 'openflowplugin'
-    branch: 'stable/sodium'
+    branch: 'stable/magnesium'
     build-node: centos7-builder-2c-8g
     build-timeout: 90
+    java-version: 'openjdk11'
     mvn-settings: 'openflowplugin-settings'
     mvn-goals: 'clean deploy javadoc:aggregate'
     mvn-opts: '-Xmx1024m'
@@ -73,7 +74,7 @@
     staging-profile-id: a68a76dc1b44c
 
 - project:
-    name: openflowplugin-neon
+    name: openflowplugin-sodium
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-maven-javadoc-jobs'
@@ -86,10 +87,13 @@
       - odl-maven-jobs
       - odl-maven-verify-jobs
 
-    stream: neon
+    csit-gate-list: 'netvirt-csit-1node-0cmb-1ctl-2cmp-apex-queens-gate-snat-conntrack-{stream}'
+    block_on_csit: false
+
+    stream: sodium
     project: 'openflowplugin'
     project-name: 'openflowplugin'
-    branch: 'stable/neon'
+    branch: 'stable/sodium'
     build-node: centos7-builder-2c-8g
     build-timeout: 90
     mvn-settings: 'openflowplugin-settings'