Merge "Fix genius CSIT jobs"

[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 3e33e7bf7ccf86ab40a19b22296636d0bdb9563b..a078abb9fe0e050e1dcb4a2b13484699bb4b2268 100644 (file)
--- a/jjb/bgpcep/bgpcep-csit-bgp-ingest.yaml
+++ b/jjb/bgpcep/bgpcep-csit-bgp-ingest.yaml
@@ -2,7 +2,7 @@
 - project:
     name: bgpcep-csit-bgp-ingest
     jobs:
-      - '{project}-csit-1node-periodic-{functionality}-{install}-{stream}'
+      - inttest-csit-1node-periodic
       # FIXME: Dicument differences from -mixed- and unify into single (matrix) definition.
 
     # The project name
@@ -15,13 +15,10 @@
     stream:
       - oxygen:
           branch: 'master'
-          jre: 'openjdk8'
       - nitrogen:
           branch: 'stable/nitrogen'
-          jre: 'openjdk8'
       - carbon:
           branch: 'stable/carbon'
-          jre: 'openjdk8'
           karaf-version: karaf3
 
     install:
@@ -34,7 +31,7 @@
         odl-jolokia,
         odl-bgpcep-data-change-counter,
         odl-bgpcep-bgp,
-        odl-netconf-topology
+        odl-bgpcep-bgp-config-example
 
     # Robot custom options:
     robot-options: >
@@ -48,5 +45,5 @@
         -v TEST_DURATION_MULTIPLIER_CHANGE_COUNT_MANY:8.0
 
     # Controller configuration
-    odl_system_flavor: 8 GB General Purpose v1
+    odl_system_flavor: v2-standard-4