Merge "Update validate-ar jobs for magnesium"

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

diff --git a/jjb/sxp/sxp-csit-filtering.yaml b/jjb/sxp/sxp-csit-filtering.yaml
index ecd7d318a6ccd757df22f24d23285e7b77e38087..08f5578aa570820fc8f121d51bac046fce5c2445 100644 (file)
--- a/jjb/sxp/sxp-csit-filtering.yaml
+++ b/jjb/sxp/sxp-csit-filtering.yaml
@@ -1,34 +1,33 @@
+---
 - project:
     name: sxp-csit-filtering
     jobs:
-        - '{project}-csit-1node-{functionality}-{install}-{stream}'
+      - inttest-csit-1node
 
     # The project name
-    project: 'sxp'
+    project: "sxp"
 
     # The functionality under test
-    functionality: 'filtering'
+    functionality: "filtering"
 
     # Project branches
     stream:
-        - carbon:
-            branch: 'master'
-            jre: 'openjdk8'
-        - boron:
-            branch: 'stable/boron'
-            jre: 'openjdk8'
-        - beryllium:
-            branch: 'stable/beryllium'
-            jre: 'openjdk7'
+      - silicon:
+          branch: "master"
+          jre: "openjdk11"
+      - aluminium:
+          branch: "stable/aluminium"
+          jre: "openjdk11"
+      - magnesium:
+          branch: "stable/magnesium"
+          jre: "openjdk11"
 
     install:
-        - only:
-            scope: 'only'
-        - all:
-            scope: 'all'
+      - 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: ""