Merge "Run AR Sodium weekly and remove jdk11 AR job"

[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 af8ada2254b968ee3e60f89e2b1989dd17ef6f66..6fe25d0fddacfb80cfec2fe12d056ede3a66e185 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-longevity.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-longevity.yaml
@@ -2,7 +2,7 @@
 - project:
     name: openflowplugin-csit-longevity
     jobs:
-      - '{project}-csit-1node-periodic-{functionality}-{install}-{stream}'
+      - inttest-csit-1node
 
     # The project name
     project: 'openflowplugin'
@@ -11,31 +11,31 @@
     # The functionality under test
     functionality: 'longevity'
 
+    # Set elasticsearch attribute to value 'long' for longevity jobs
+    #elasticsearch-attribute: 'long'
+
     # Project branches
     stream:
-      - oxygen:
+      - aluminium:
           branch: 'master'
-      - nitrogen:
-          branch: 'stable/nitrogen'
-      - carbon:
-          branch: 'stable/carbon'
-          karaf-version: karaf3
+          jre: 'openjdk11'
+      - magnesium:
+          branch: 'stable/magnesium'
+          jre: 'openjdk11'
+      - sodium:
+          branch: 'stable/sodium'
 
     install:
       - only:
           scope: 'only'
 
+    # Job images
+    tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-28 - 20190415-091034.881'
+
     # Features to install
     install-features: >
         odl-openflowplugin-flow-services-rest,
-        odl-openflowplugin-app-table-miss-enforcer,
-        decanter-collector-jmx,
-        decanter-appender-elasticsearch
+        odl-openflowplugin-app-table-miss-enforcer
 
     # Robot custom options
-    robot-options: '-v TEST_LENGTH:23h'
-
-    # mininet image
-    tools_system_image: Ubuntu 16.04 - mininet-ovs-25 - 20171014-0208
-
-    schedule: '{schedule-saturday}'
+    robot-options: '-v TEST_LENGTH:23h -v NUM_SWITCHES:16'