Merge "Update branch cutting script"

[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 693849af2877289d9061776a6565555ff036e5f8..a0316bfedc92278bf7d85bdf6bdadb9f32199c42 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,15 +15,14 @@
 
     # Project branches
     stream:
-      - oxygen:
+      - fluorine:
           branch: 'master'
-          jre: 'openjdk8'
+      - oxygen:
+          branch: 'stable/oxygen'
       - nitrogen:
           branch: 'stable/nitrogen'
-          jre: 'openjdk8'
       - carbon:
           branch: 'stable/carbon'
-          jre: 'openjdk8'
           karaf-version: karaf3
 
     install:
@@ -35,7 +34,9 @@
         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