Remove unsupported Beryllium jobs

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

diff --git a/jjb/netconf/netconf-userfeatures.yaml b/jjb/netconf/netconf-userfeatures.yaml
index 66bb266555163d261560a065a3cf4aad83c6fa92..811c8450fa54dd291034a00bb9721ade2ecf2cd7 100644 (file)
--- a/jjb/netconf/netconf-userfeatures.yaml
+++ b/jjb/netconf/netconf-userfeatures.yaml
@@ -13,25 +13,21 @@
 
     # 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-netconf-mdsal,
-              odl-clustering-test-app,
-              odl-netconf-connector-all,
-              odl-netconf-topology
-          robot-options: '-v NETOPEER_USER:root -v USE_NETCONF_CONNECTOR:True'
-      - beryllium:
-          branch: 'stable/beryllium'
-          jre: 'openjdk7'
-          install-features: >
-              odl-restconf,
-              odl-netconf-mdsal,
+              odl-mdsal-apidocs,
               odl-clustering-test-app,
               odl-netconf-connector-all,
               odl-netconf-topology
@@ -47,6 +43,7 @@
     install-features: >
         odl-restconf,
         odl-netconf-mdsal,
+        odl-mdsal-apidocs,
         odl-clustering-test-app,
         odl-netconf-topology