Merge "Update cloud image Ubuntu18.04 mininet ovs"

[releng/builder.git] / jjb / sxp / sxp-csit-topology.yaml

diff --git a/jjb/sxp/sxp-csit-topology.yaml b/jjb/sxp/sxp-csit-topology.yaml
index 52da04d67c11cd0815f127950f5a966f18743965..2287f6f168e7e4f2b0c453bdf0ae98b7bcf4c6e2 100644 (file)
--- a/jjb/sxp/sxp-csit-topology.yaml
+++ b/jjb/sxp/sxp-csit-topology.yaml
@@ -2,39 +2,26 @@
 - project:
     name: sxp-csit-topology
     jobs:
-      - '{project}-csit-1node-{functionality}-{install}-{stream}'
+      - inttest-csit-1node
 
     # The project name
-    project: 'sxp'
+    project: "sxp"
 
     # The functionality under test
-    functionality: 'topology'
+    functionality: "topology"
 
     # Project branches
     stream:
-      - oxygen:
-          branch: 'master'
-          jre: 'openjdk8'
-      - nitrogen:
-          branch: 'stable/nitrogen'
-          jre: 'openjdk8'
-      - carbon:
-          branch: 'stable/carbon'
-          jre: 'openjdk8'
-          karaf-version: karaf3
-      - boron:
-          branch: 'stable/boron'
-          jre: 'openjdk8'
-          karaf-version: karaf3
+      - master:
+          branch: "master"
+          jre: "openjdk11"
 
     install:
-      - only:
-          scope: 'only'
       - all:
-          scope: 'all'
+          scope: "all"
 
     # Features to install
-    install-features: 'odl-restconf,odl-sxp-controller'
+    install-features: "odl-restconf,odl-sxp-routing"
 
     # Robot custom options
-    robot-options: ''
+    robot-options: ""