Rework the way Java version is set in CSIT jobs

[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 5aa8096bf7a13312bef2c7500d3b65fa86ebde84..0dd152479276cc2a7869208496c9f2f15aed3c42 100644 (file)
--- a/jjb/bgpcep/bgpcep-csit-throughpcep.yaml
+++ b/jjb/bgpcep/bgpcep-csit-throughpcep.yaml
@@ -11,10 +11,15 @@
 
     # Project branches
     stream:
-        - beryllium:
+        - boron:
             branch: 'master'
+            jre: 'openjdk8'
+        - beryllium:
+            branch: 'stable/beryllium'
+            jre: 'openjdk7'
         - stable-lithium:
             branch: 'stable/lithium'
+            jre: 'openjdk7'
 
     install:
         - only:
@@ -23,13 +28,13 @@
             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'
+    install-features: 'odl-restconf,odl-bgpcep-pcep-all,odl-bgpcep-pcep,odl-netconf-connector-all'
 
     # Readiness check timeout is lowered from the suite's high default value.
     # The other options are workarounds for Sandbox not being as performant
     # as the private lab where this suite was developed.
     # Robot custom options:
-    robot-options: '-v PCEP_READY_VERIFY_TIMEOUT:5 -v RESTCONF_REUSE:False -v UPDATER_TIMEOUT:360'
+    robot-options: '-v PCEP_READY_VERIFY_TIMEOUT:5 -v RESTCONF_REUSE:False -v UPDATER_TIMEOUT:600'
 
     # This performance test can take up to one hour to finish,
     # so the job is defined to run once a day.