Merge "Download/install JDK9"

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

diff --git a/jjb/openflowplugin/openflowplugin-csit-flow-services.yaml b/jjb/openflowplugin/openflowplugin-csit-flow-services.yaml
index 43def80ed2eff6caf206251d7b542611f946c19a..ffbfa0fc0864500aa9ca55e91668d9e4a51efbf3 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-flow-services.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-flow-services.yaml
@@ -16,24 +16,24 @@
     stream:
       - oxygen:
           branch: 'master'
-          jre: 'openjdk8'
       - nitrogen:
           branch: 'stable/nitrogen'
-          jre: 'openjdk8'
       - carbon:
           branch: 'stable/carbon'
-          jre: 'openjdk8'
-          karaf-version: karaf3
+          karaf-version: 'karaf3'
 
     install:
       - all:
           scope: 'all'
 
+    # Job images
+    tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-26 - 20171208-1847'
+
     # Features to install
-    install-features: 'odl-openflowplugin-flow-services-rest,odl-openflowplugin-app-table-miss-enforcer'
+    install-features: >
+        odl-openflowplugin-flow-services-rest,
+        odl-openflowplugin-app-table-miss-enforcer,
+        odl-openflowplugin-nxm-extensions
 
     # Robot custom options
     robot-options: ''
-
-    # mininet image
-    tools_system_image: Ubuntu 16.04 - mininet-ovs-25 - 20170808-0158