Merge "Add job to update auto update CSIT Tests"

[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 2490b7609df3ad2225b54f6e6ab37aa30a5214b3..0e0fd1cf070b56366d26231283d1e915f77ad22e 100644 (file)
--- a/jjb/bgpcep/bgpcep-csit-userfeatures.yaml
+++ b/jjb/bgpcep/bgpcep-csit-userfeatures.yaml
@@ -2,7 +2,7 @@
     name: bgpcep-csit-userfeatures
     jobs:
         - '{project}-csit-1node-{functionality}-{install}-{stream}'
-        - '{project}-csit-verify-1node-{functionality}-{stream}'
+        - '{project}-csit-verify-1node-{functionality}'
 
     # The project name
     project: 'bgpcep'
@@ -12,10 +12,19 @@
 
     # Project branches
     stream:
-        - beryllium:
+        - carbon:
             branch: 'master'
-        - stable-lithium:
-            branch: 'stable/lithium'
+            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'
 
     install:
         - only:
@@ -24,10 +33,8 @@
             scope: 'all'
 
     # Features to install
-    install-features: 'odl-restconf,odl-bgpcep-pcep-all,odl-bgpcep-bgp-all,odl-bgpcep-bgp,odl-bgpcep-pcep,odl-netconf-connector-all'
+    # *-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-bmp,odl-jolokia'
 
     # Robot custom options
-    robot-options: ''
-
-    # Trigger jobs (upstream dependencies)
-    trigger-jobs: 'odlparent-distribution-{stream},yangtools-distribution-{stream},controller-distribution-{stream},tcpmd5-distribution-{stream},bgpcep-distribution-{stream}'
+    robot-options: '-v USE_NETCONF_CONNECTOR:False'