X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fbgpcep%2Fbgpcep-csit-userfeatures.yaml;h=2263196d428f4c80b449ebf63468450d62cfcd30;hb=dfe54cf86451de53221319dd0a10c3ec89c525c0;hp=7587a55525d187e05bbf1614c0a844ed7ec14c70;hpb=e00bc39f5352d8f51b59c68932c1b5964d83e732;p=releng%2Fbuilder.git

diff --git a/jjb/bgpcep/bgpcep-csit-userfeatures.yaml b/jjb/bgpcep/bgpcep-csit-userfeatures.yaml
index 7587a5552..2263196d4 100644
--- a/jjb/bgpcep/bgpcep-csit-userfeatures.yaml
+++ b/jjb/bgpcep/bgpcep-csit-userfeatures.yaml
@@ -1,52 +1,41 @@
+---
 - project:
     name: bgpcep-csit-userfeatures
     jobs:
-        - '{project}-csit-1node-{functionality}-{install}-{stream}'
-        - '{project}-csit-verify-1node-{functionality}'
+      - '{project}-csit-1node-{functionality}-{install}-{stream}'
+      - inttest-csit-verify-1node
 
     # The project name
     project: 'bgpcep'
 
     # The functionality under test
-    functionality: 'userfeatures'
+    functionality:
+      - userfeatures
+      - gate-userfeatures
 
     # Project branches
     stream:
-        - carbon:
-            branch: 'master'
-            jre: 'openjdk8'
-        - boron:
-            branch: 'stable/boron'
-            jre: 'openjdk8'
-            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'
-        - beryllium:
-            branch: 'stable/beryllium'
-            jre: 'openjdk7'
-            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'
+      - oxygen:
+          branch: 'master'
+      - nitrogen:
+          branch: 'stable/nitrogen'
+      - carbon:
+          branch: 'stable/carbon'
+          karaf-version: karaf3
 
     install:
-        - only:
-            scope: 'only'
-        - all:
-            scope: 'all'
+      - 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-all,odl-bgpcep-bgp-all,odl-bgpcep-bgp,odl-bgpcep-pcep,odl-bgpcep-bmp,odl-jolokia'
+    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
     robot-options: '-v USE_NETCONF_CONNECTOR:False'
-
-    # Trigger jobs (upstream dependencies)
-    # Netconf is there for run-time re-configuration.
-    # AAA could also be a dependency, but probability of breakage is too low to trigger everytime.
-    trigger-jobs: >
-        odlparent-distribution-{stream},
-        yangtools-distribution-{stream},
-        controller-distribution-{stream},
-        mdsal-distribution-{stream},
-        netconf-distribution-{stream},
-        tcpmd5-distribution-{stream},
-        bgpcep-distribution-{stream}