Merge "Fix int/dist version in AR"

[releng/builder.git] / jjb / openflowplugin / openflowplugin-csit-longevity.yaml

diff --git a/jjb/openflowplugin/openflowplugin-csit-longevity.yaml b/jjb/openflowplugin/openflowplugin-csit-longevity.yaml
index b41d61555e22166e2088bd15e22cad1ce50cd12c..3f0b4e17dcae26a7a043e581fc72fe9a63ae5f08 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-longevity.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-longevity.yaml
@@ -5,40 +5,35 @@
       - inttest-csit-1node
 
     # The project name
-    project: 'openflowplugin'
+    project: "openflowplugin"
     build-timeout: 1440
 
     # The functionality under test
-    functionality: 'longevity'
+    functionality: "longevity"
 
     # Set elasticsearch attribute to value 'long' for longevity jobs
     #elasticsearch-attribute: 'long'
 
     # Project branches
     stream:
+      - phosphorus:
+          branch: "master"
+          jre: "openjdk11"
       - silicon:
-          branch: 'master'
-          jre: 'openjdk11'
+          branch: "stable/silicon"
+          jre: "openjdk11"
       - aluminium:
-          branch: 'stable/aluminium'
-          jre: 'openjdk11'
-      - magnesium:
-          branch: 'stable/magnesium'
-          jre: 'openjdk11'
-      - sodium:
-          branch: 'stable/sodium'
+          branch: "stable/aluminium"
+          jre: "openjdk11"
 
     install:
       - only:
-          scope: 'only'
-
-    # Job images
-    tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-28 - 20190415-091034.881'
+          scope: "only"
 
     # Features to install
     install-features: >
-        odl-openflowplugin-flow-services-rest,
-        odl-openflowplugin-app-table-miss-enforcer
+      odl-openflowplugin-flow-services-rest,
+      odl-openflowplugin-app-table-miss-enforcer
 
     # Robot custom options
-    robot-options: '-v TEST_LENGTH:23h -v NUM_SWITCHES:16'
+    robot-options: "-v TEST_LENGTH:23h -v NUM_SWITCHES:16"