Merge "Enhance 6Wind quagga image on ubuntu16 & centos7"

[releng/builder.git] / jjb / openflowplugin / openflowplugin-csit-scale-stats-collection-daily-frs.yaml

diff --git a/jjb/openflowplugin/openflowplugin-csit-scale-stats-collection-daily-frs.yaml b/jjb/openflowplugin/openflowplugin-csit-scale-stats-collection-daily-frs.yaml
index 32abb0a37e75e72da653726c1d17fcfde2d084e5..9bd657d8c7354bb141b309af53694cfe1f57a991 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-scale-stats-collection-daily-frs.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-scale-stats-collection-daily-frs.yaml
@@ -1,7 +1,8 @@
+---
 - project:
     name: openflowplugin-csit-scale-stats-collection-daily-frs
     jobs:
-        - '{project}-csit-1node-periodic-{functionality}-{install}-{stream}'
+      - '{project}-csit-1node-periodic-{functionality}-{install}-{stream}'
 
     # The project name
     project: 'openflowplugin'
@@ -11,19 +12,28 @@
 
     # Project branches
     stream:
-        - carbon:
-            branch: 'master'
-            jre: 'openjdk8'
-        - boron:
-            branch: 'stable/boron'
-            jre: 'openjdk8'
+      - nitrogen:
+          branch: 'master'
+          jre: 'openjdk8'
+      - carbon:
+          branch: 'stable/carbon'
+          jre: 'openjdk8'
+          karaf-version: karaf3
+      - boron:
+          branch: 'stable/boron'
+          jre: 'openjdk8'
+          karaf-version: karaf3
 
     install:
-        - only:
-            scope: 'only'
+      - only:
+          scope: 'only'
 
     # Features to install
-    install-features: 'odl-restconf,odl-openflowplugin-app-config-pusher,odl-openflowplugin-app-topology,odl-openflowplugin-app-forwardingrules-sync'
+    install-features: >
+        odl-restconf,
+        odl-openflowplugin-app-config-pusher,
+        odl-openflowplugin-app-topology,
+        odl-openflowplugin-app-forwardingrules-sync
 
     # Robot custom options
     robot-options: '-v flnr:50000'