Merge "Fix for VTN CSIT verify job"

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

diff --git a/jjb/bgpcep/bgpcep-csit-bgp-ingest.yaml b/jjb/bgpcep/bgpcep-csit-bgp-ingest.yaml
index e81d7975738d115c986ff65f47b51d41b8770a7b..edf86e7343695beb1bc2ba9d2bdc33cbc96d937f 100644 (file)
--- a/jjb/bgpcep/bgpcep-csit-bgp-ingest.yaml
+++ b/jjb/bgpcep/bgpcep-csit-bgp-ingest.yaml
@@ -11,15 +11,15 @@
 
     # Project branches
     stream:
-        - boron:
+        - carbon:
             branch: 'master'
-            jdk: 'openjdk8'
+            jre: 'openjdk8'
+        - boron:
+            branch: 'stable/boron'
+            jre: 'openjdk8'
         - beryllium:
             branch: 'stable/beryllium'
-            jdk: 'openjdk7'
-        - stable-lithium:
-            branch: 'stable/lithium'
-            jdk: 'openjdk7'
+            jre: 'openjdk7'
 
     install:
         - only:
@@ -31,11 +31,14 @@
     install-features: 'odl-restconf,odl-bgpcep-data-change-counter,odl-bgpcep-bgp-all,odl-bgpcep-bgp,odl-netconf-connector-all'
 
     # Robot custom options:
-    robot-options: '-v CHECK_PERIOD_PREFIX_COUNT_SINGLE:10 -v REPETITIONS_CHANGE_COUNT_SINGLE:3 -v CHECK_PERIOD_PREFIX_COUNT_MANY:10 -v TEST_DURATION_MULTIPLIER_PREFIX_COUNT_MANY:8.0 -v REPETITIONS_CHANGE_COUNT_MANY:10 -v MULTIPLICITY_CHANGE_COUNT_MANY:600 -v TEST_DURATION_MULTIPLIER_CHANGE_COUNT_MANY:8.0 '
+    robot-options: '-v USE_NETCONF_CONNECTOR:True -v CHECK_PERIOD_PREFIX_COUNT_SINGLE:10 -v REPETITIONS_CHANGE_COUNT_SINGLE:3 -v CHECK_PERIOD_PREFIX_COUNT_MANY:10 -v TEST_DURATION_MULTIPLIER_PREFIX_COUNT_MANY:8.0 -v REPETITIONS_CHANGE_COUNT_MANY:10 -v MULTIPLICITY_CHANGE_COUNT_MANY:600 -v TEST_DURATION_MULTIPLIER_CHANGE_COUNT_MANY:8.0 '
 
     # Trigger jobs: (daily)
     schedule: 'H H * * *'
 
+    # Controller configuration
+    controller-image: 'centos7-java-builder-2c-8g'
+
 - project:
     name: bgpcep-csit-bgp-ingest-mixed
     jobs:
@@ -49,12 +52,15 @@
 
     # Project branches
     stream:
-        - boron:
+        - carbon:
             branch: 'master'
+            jre: 'openjdk8'
+        - boron:
+            branch: 'stable/boron'
+            jre: 'openjdk8'
         - beryllium:
             branch: 'stable/beryllium'
-        - stable-lithium:
-            branch: 'stable/lithium'
+            jre: 'openjdk7'
 
     install:
         - only:
@@ -67,11 +73,14 @@
 
     # Robot custom options
     # Increase the TEST_DURATION_MULTIPLIER if the test runs in slower test environment or more complex scenario is chosen
-    robot-options: '-v COUNT:1000000 -v INSERT:10 -v WITHDRAW:9 -v PREFILL:10 -v UPDATE:single -v TEST_DURATION_MULTIPLIER:4'
+    robot-options: '-v USE_NETCONF_CONNECTOR:True -v COUNT:1000000 -v INSERT:10 -v WITHDRAW:9 -v PREFILL:10 -v UPDATE:single -v TEST_DURATION_MULTIPLIER:4'
 
     # Trigger jobs (daily)
     schedule: 'H H * * *'
 
+    # Controller configuration
+    controller-image: 'centos7-java-builder-2c-8g'
+
     # Plot Info
     01-plot-title: 'Number of generated updates'
     01-plot-yaxis: 'Total number of updates'