Merge "Fix int/dist version in AR"

[releng/builder.git] / jjb / openflowplugin / openflowplugin-csit-sanity.yaml

diff --git a/jjb/openflowplugin/openflowplugin-csit-sanity.yaml b/jjb/openflowplugin/openflowplugin-csit-sanity.yaml
index c6a90e064940d8ae3c384805c3123be080617324..f68de4c617850ba23b5fe1114d5f242f123995f5 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-sanity.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-sanity.yaml
@@ -6,35 +6,32 @@
       - inttest-csit-verify-1node
 
     # The project name
-    project: 'openflowplugin'
+    project: "openflowplugin"
 
     # The functionality under test
-    functionality: 'sanity'
+    functionality: "sanity"
 
     # Project branches
     stream:
-      - sodium:
-          branch: 'master'
-      - neon:
-          branch: 'stable/neon'
-      - fluorine:
-          branch: 'stable/fluorine'
-      - oxygen:
-          branch: 'stable/oxygen'
-          disable-job: true
+      - phosphorus:
+          branch: "master"
+          jre: "openjdk11"
+      - silicon:
+          branch: "stable/silicon"
+          jre: "openjdk11"
+      - aluminium:
+          branch: "stable/aluminium"
+          jre: "openjdk11"
 
     install:
       - only:
-          scope: 'only'
-
-    # Job images
-    tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-28 - 20181001-220228.326'
+          scope: "only"
 
     # Features to install
     install-features: >
-        odl-openflowplugin-flow-services-rest,
-        odl-openflowplugin-app-table-miss-enforcer,
-        odl-openflowplugin-nxm-extensions
+      odl-openflowplugin-flow-services-rest,
+      odl-openflowplugin-app-table-miss-enforcer,
+      odl-openflowplugin-nxm-extensions
 
     # Robot custom options
-    robot-options: '-v SWITCHES:3'
+    robot-options: "-v SWITCHES:3"