Merge "Update cloud image"

[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 22f8992801e09bfcd0b9ece74a8120787600f920..ce09d591950d27e75c0bff94f1c10221d53061e5 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-flow-services.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-flow-services.yaml
@@ -2,10 +2,10 @@
 - project:
     name: openflowplugin-csit-flow-services
     jobs:
-      - '{project}-csit-1node-{functionality}-{install}-{stream}'
+      - inttest-csit-1node
 
     # The project name
-    project: 'openflowplugin'
+    project: "openflowplugin"
 
     # The functionality under test
     functionality:
@@ -14,26 +14,27 @@
 
     # Project branches
     stream:
-      - oxygen:
-          branch: 'master'
-      - nitrogen:
-          branch: 'stable/nitrogen'
-      - carbon:
-          branch: 'stable/carbon'
-          karaf-version: karaf3
+      - silicon:
+          branch: "master"
+          jre: "openjdk11"
+          install: "all"
+      - aluminium:
+          branch: "stable/aluminium"
+          jre: "openjdk11"
+          install: "all"
+      - magnesium:
+          branch: "stable/magnesium"
+          jre: "openjdk11"
+          install: "all"
 
-    install:
-      - all:
-          scope: 'all'
+    # Job images
+    tools_system_image: "ZZCI - Ubuntu 16.04 - mininet-ovs-28 - x86_64 - 20200813-051640.743"
 
     # 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: ''
-
-    # mininet image
-    tools_system_image: ZZCI - Ubuntu 16.04 - mininet-ovs-25 - 20171208-1847
+    robot-options: ""