Merge "Remove jjb custom scripting"

[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..531e0415c11b68d55144fb91f01d87a51b1674a2 100644 (file)
--- a/jjb/bgpcep/bgpcep-csit-bgp-ingest.yaml
+++ b/jjb/bgpcep/bgpcep-csit-bgp-ingest.yaml
@@ -13,13 +13,13 @@
     stream:
         - boron:
             branch: 'master'
-            jdk: 'openjdk8'
+            jre: 'openjdk8'
         - beryllium:
             branch: 'stable/beryllium'
-            jdk: 'openjdk7'
+            jre: 'openjdk7'
         - stable-lithium:
             branch: 'stable/lithium'
-            jdk: 'openjdk7'
+            jre: 'openjdk7'
 
     install:
         - only:
@@ -36,6 +36,9 @@
     # Trigger jobs: (daily)
     schedule: 'H H * * *'
 
+    # Controller configuration
+    controller-image: 'centos7-java-builder-2c-8g'
+
 - project:
     name: bgpcep-csit-bgp-ingest-mixed
     jobs:
@@ -51,10 +54,13 @@
     stream:
         - boron:
             branch: 'master'
+            jre: 'openjdk8'
         - beryllium:
             branch: 'stable/beryllium'
+            jre: 'openjdk7'
         - stable-lithium:
             branch: 'stable/lithium'
+            jre: 'openjdk7'
 
     install:
         - only:
@@ -72,6 +78,9 @@
     # 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'