Merge "Remove of-config carbon jobs"

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

diff --git a/jjb/bgpcep/bgpcep-csit-bgpclustering-ha.yaml b/jjb/bgpcep/bgpcep-csit-bgpclustering-ha.yaml
index 2ba4c45cacf67076f2dfad516eda5a542678dec5..c2cf626640e4024cdeb66a88cd72e6b04102be46 100644 (file)
--- a/jjb/bgpcep/bgpcep-csit-bgpclustering-ha.yaml
+++ b/jjb/bgpcep/bgpcep-csit-bgpclustering-ha.yaml
@@ -2,7 +2,7 @@
 - project:
     name: bgpcep-csit-bgpclustering-ha
     jobs:
-      - '{project}-csit-3node-periodic-{functionality}-{install}-{stream}'
+      - inttest-csit-3node
 
     # The project name
     project: 'bgpcep'
@@ -12,7 +12,7 @@
 
     # Project branches
     stream:
-      - oxygen:
+      - fluorine:
           branch: 'master'
           install-features: >
               odl-restconf,
@@ -21,16 +21,17 @@
               odl-bgpcep-bmp,
               odl-bgpcep-bmp-config-example,
               odl-bgpcep-pcep
-
-      - nitrogen:
-          branch: 'stable/nitrogen'
+      - oxygen:
+          branch: 'stable/oxygen'
           install-features: >
               odl-restconf,
               odl-bgpcep-bgp,
-              odl-bgpcep-bgp-config-example
-      - carbon:
-          branch: 'stable/carbon'
-          karaf-version: karaf3
+              odl-bgpcep-bgp-config-example,
+              odl-bgpcep-bmp,
+              odl-bgpcep-bmp-config-example,
+              odl-bgpcep-pcep
+      - nitrogen:
+          branch: 'stable/nitrogen'
           install-features: >
               odl-restconf,
               odl-bgpcep-bgp,