Merge "Add Ubuntu 18.04 docker 4c-4g system"

[releng/builder.git] / jjb / sfc / sfc-csit-full-deploy.yaml

diff --git a/jjb/sfc/sfc-csit-full-deploy.yaml b/jjb/sfc/sfc-csit-full-deploy.yaml
index 38a86ec25178ef886d0db328b6ef3f84336a1adc..da86d76c741cbe1a5a8bc1c4dbaecb20dcee1252 100644 (file)
--- a/jjb/sfc/sfc-csit-full-deploy.yaml
+++ b/jjb/sfc/sfc-csit-full-deploy.yaml
@@ -5,36 +5,38 @@
       - inttest-csit-3node-docker
 
     # The project name
-    project: 'sfc'
+    project: "sfc"
 
     # The functionality under test
-    functionality: 'full-deploy'
+    functionality: "full-deploy"
 
     # Project branches
     stream:
+      - silicon:
+          branch: "master"
+          jre: "openjdk11"
+      - aluminium:
+          branch: "stable/aluminium"
+          jre: "openjdk11"
       - magnesium:
-          branch: 'master'
-          jre: 'openjdk11'
+          branch: "stable/magnesium"
+          jre: "openjdk11"
       - sodium:
-          branch: 'stable/sodium'
-      - neon:
-          branch: 'stable/neon'
-      - fluorine:
-          branch: 'stable/fluorine'
+          branch: "stable/sodium"
 
     install:
       - all:
-          scope: 'all'
+          scope: "all"
 
     # Features to install
     install-features: >
-        odl-sfc-provider,
-        odl-sfc-ui,
-        odl-sfc-openflow-renderer,
-        odl-sfc-scf-openflow,
-        odl-sfc-sb-rest,
-        odl-sfc-ovs,
-        odl-sfc-netconf
+      odl-sfc-provider,
+      odl-sfc-ui,
+      odl-sfc-openflow-renderer,
+      odl-sfc-scf-openflow,
+      odl-sfc-sb-rest,
+      odl-sfc-ovs,
+      odl-sfc-netconf
 
     # Robot custom options
-    robot-options: ''
+    robot-options: ""