Merge "Purge un-needed references to lithium stream"

[releng/builder.git] / jjb / bgpcep / bgpcep-csit-userfeatures.yaml

diff --git a/jjb/bgpcep/bgpcep-csit-userfeatures.yaml b/jjb/bgpcep/bgpcep-csit-userfeatures.yaml
index 1c35df72e57e85cb73f8151b250b19ae70126e1a..7d4c346eaa1f7f3fe7d3debdbeddfee38f6d79a2 100644 (file)
--- a/jjb/bgpcep/bgpcep-csit-userfeatures.yaml
+++ b/jjb/bgpcep/bgpcep-csit-userfeatures.yaml
@@ -12,15 +12,15 @@
 
     # Project branches
     stream:
-        - boron:
+        - carbon:
             branch: 'master'
             jre: 'openjdk8'
+        - boron:
+            branch: 'stable/boron'
+            jre: 'openjdk8'
         - beryllium:
             branch: 'stable/beryllium'
             jre: 'openjdk7'
-        - stable-lithium:
-            branch: 'stable/lithium'
-            jre: 'openjdk7'
 
     install:
         - only:
@@ -29,7 +29,7 @@
             scope: 'all'
 
     # Features to install
-    # *-all is for Lithium and Beryllium, without -all is for Lithium and Boron.
+    # *-all is for Beryllium and Boron, without -all is for Boron and Carbon.
     install-features: 'odl-restconf,odl-bgpcep-pcep-all,odl-bgpcep-bgp-all,odl-bgpcep-bgp,odl-bgpcep-pcep,odl-netconf-connector-all,odl-bgpcep-bmp,odl-jolokia'
 
     # Robot custom options