Merge "Add CentOS8 images to the jenkins-config"

[releng/builder.git] / jjb / openflowplugin / openflowplugin-patch-test.yaml

diff --git a/jjb/openflowplugin/openflowplugin-patch-test.yaml b/jjb/openflowplugin/openflowplugin-patch-test.yaml
index 083337d1f0c3b2a9e06eb36d47f61ccf780860be..9b4ddce74511c547323954791447b3485028eef9 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-patch-test.yaml
+++ b/jjb/openflowplugin/openflowplugin-patch-test.yaml
@@ -9,16 +9,26 @@
 
     # Project branches
     stream:
-      - fluorine:
+      - silicon:
           branch: 'master'
-          os-branch: 'queens'
-      - oxygen:
-          branch: 'stable/oxygen'
-          os-branch: 'queens'
+          java-version: 'openjdk11'
+      - aluminium:
+          branch: 'stable/aluminium'
+          java-version: 'openjdk11'
+      - magnesium:
+          branch: 'stable/magnesium'
+          java-version: 'openjdk11'
+      - sodium:
+          branch: 'stable/sodium'
 
+    os-branch: 'queens'
     jdk: 'openjdk8'
 
     feature:
+      - cbench:
+          csit-list: >
+              openflowplugin-csit-1node-cbench-only-{stream}
+
       - core:
           csit-list: >
               openflowplugin-csit-1node-gate-flow-services-all-{stream},
@@ -31,8 +41,12 @@
 
       - netvirt:
           csit-list: >
-              netvirt-csit-1node-openstack-{os-branch}-gate-stateful-{stream}
+              netvirt-csit-1node-{os-std-topo}-openstack-{os-branch}-gate-stateful-{stream}
 
       - cluster-netvirt:
           csit-list: >
-              netvirt-csit-3node-openstack-{os-branch}-gate-stateful-{stream}
+              netvirt-csit-3node-{os-std-topo}-openstack-{os-branch}-gate-stateful-{stream}
+
+      - genius:
+          csit-list: >
+              genius-csit-1node-gate-only-{stream}