Create Neon jobs and bump fluorine branch

[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 6ea4a1ba7fbd183c97a57145cbf55c0c06679889..40e58d612ae23af1fc2febc2b8297b20128b7692 100644 (file)
--- a/jjb/bgpcep/bgpcep-csit-userfeatures.yaml
+++ b/jjb/bgpcep/bgpcep-csit-userfeatures.yaml
@@ -2,8 +2,8 @@
 - project:
     name: bgpcep-csit-userfeatures
     jobs:
-      - '{project}-csit-1node-{functionality}-{install}-{stream}'
-      - '{project}-csit-verify-1node-{functionality}'
+      - inttest-csit-1node
+      - inttest-csit-verify-1node
 
     # The project name
     project: 'bgpcep'
@@ -15,42 +15,25 @@
 
     # Project branches
     stream:
-      - oxygen:
+      - neon:
           branch: 'master'
-          jre: 'openjdk8'
-      - nitrogen:
-          branch: 'stable/nitrogen'
-          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-bgpcep-pcep-all,
-              odl-bgpcep-bgp-all,
-              odl-bgpcep-bgp,
-              odl-bgpcep-pcep,
-              odl-netconf-connector-all,
-              odl-bgpcep-bmp,
-              odl-jolokia
-          robot-options: '-v USE_NETCONF_CONNECTOR:True'
+      - fluorine:
+          branch: 'stable/fluorine'
+      - oxygen:
+          branch: 'stable/oxygen'
 
     install:
       - all:
           scope: 'all'
 
     # Features to install
-    # *-all is for Beryllium and Boron, without -all is for Boron and Carbon.
     install-features: >
         odl-restconf,
         odl-bgpcep-pcep,
         odl-bgpcep-bgp,
+        odl-bgpcep-bgp-config-example,
         odl-bgpcep-bmp,
+        odl-bgpcep-bmp-config-example,
         odl-jolokia
 
     # Robot custom options