Merge "Update validate-ar jobs for silicon"

[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 3156356791ccf95cd1bf5993e2cce557aad92ece..cd52b424838e23bab581bf175a63ca5ba5814e36 100644 (file)
--- a/jjb/sxp/sxp-csit-topology.yaml
+++ b/jjb/sxp/sxp-csit-topology.yaml
@@ -1,40 +1,36 @@
+---
 - 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:
-        - carbon:
-            branch: 'master'
-            jre: 'openjdk8'
-        - boron:
-            branch: 'stable/boron'
-            jre: 'openjdk8'
-        - beryllium:
-            branch: 'stable/beryllium'
-            jre: 'openjdk7'
-        - stable-lithium:
-            branch: 'stable/lithium'
-            jre: 'openjdk7'
+      - phosphorus:
+          branch: "master"
+          jre: "openjdk11"
+      - silicon:
+          branch: "stable/silicon"
+          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: ''
-
-    # Trigger jobs (upstream dependencies)
-    trigger-jobs: 'yangtools-distribution-{stream},controller-distribution-{stream},sxp-distribution-{stream},mdsal-distribution-{stream},netconf-distribution-{stream}'
+    robot-options: ""