Merge "Remove snmp carbon jobs"

[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 600a4efa373897c4cb585fb6d8b47c80e722f5fb..38b8e609a3c68d96ae039a0e4e51151119ec7200 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'
@@ -13,22 +13,20 @@
 
     # Project branches
     stream:
-      - nitrogen:
+      - fluorine:
           branch: 'master'
-          jre: 'openjdk8'
-      - carbon:
-          branch: 'stable/carbon'
-          jre: 'openjdk8'
-          karaf-version: karaf3
-      - boron:
-          branch: 'stable/boron'
-          jre: 'openjdk8'
-          karaf-version: karaf3
+      - oxygen:
+          branch: 'stable/oxygen'
+      - nitrogen:
+          branch: 'stable/nitrogen'
 
     install:
       - only:
           scope: 'only'
 
+    # Job images
+    tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-28 - 20180301-1041'
+
     # Features to install
     install-features: >
         odl-openflowplugin-flow-services-rest,
@@ -37,10 +35,4 @@
         decanter-appender-elasticsearch
 
     # Robot custom options
-    robot-options: '-v TEST_LENGTH:23h'
-
-    # mininet image
-    tools_system_image: Ubuntu 16.04 - mininet-ovs-25 - 20170609-0221
-
-    # Trigger jobs (on saturday)
-    schedule: 'H H * * 6'
+    robot-options: '-v TEST_LENGTH:23h -v NUM_SWITCHES:16'