Merge "Add job to comprehensively test RPM building logic"

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

diff --git a/jjb/bgpcep/bgpcep-csit-throughpcep.yaml b/jjb/bgpcep/bgpcep-csit-throughpcep.yaml
index 8a5c95b339b1ae3b710e9140102cae30e8080af8..5e4743647b0042a5d4f38959a10c704322590691 100644 (file)
--- a/jjb/bgpcep/bgpcep-csit-throughpcep.yaml
+++ b/jjb/bgpcep/bgpcep-csit-throughpcep.yaml
@@ -22,11 +22,6 @@
           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-pcep'
 
     install:
       - all:
@@ -61,18 +56,16 @@
 
     # Project branches
     stream:
-      - nitrogen:
+      - oxygen:
           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-pcep'
 
     install:
       - all:
@@ -93,4 +86,3 @@
 
     # Controller configuration
     odl_system_flavor: 8 GB General Purpose v1
-