Merge "Adjust for karaf 4 not happening in carbon"

[releng/builder.git] / jjb / netconf / netconf-scale.yaml

diff --git a/jjb/netconf/netconf-scale.yaml b/jjb/netconf/netconf-scale.yaml
index 53b5ebcd5ef16e45ebf6720d1f0613821d8fa460..4c7763258d7f8c8953449bc9b377f6d3902b6975 100644 (file)
--- a/jjb/netconf/netconf-scale.yaml
+++ b/jjb/netconf/netconf-scale.yaml
@@ -12,12 +12,17 @@
 
     # Project branches
     stream:
-      - carbon:
+      - nitrogen:
           branch: 'master'
           jre: 'openjdk8'
+      - carbon:
+          branch: 'stable/carbon'
+          jre: 'openjdk8'
+          karaf-version: karaf3
       - boron:
           branch: 'stable/boron'
           jre: 'openjdk8'
+          karaf-version: karaf3
           install-features: >
               odl-restconf,
               odl-clustering-test-app,
@@ -28,6 +33,7 @@
       - beryllium:
           branch: 'stable/beryllium'
           jre: 'openjdk7'
+          karaf-version: karaf3
           install-features: >
               odl-restconf,
               odl-clustering-test-app,