Merge "Update Ansible playbooks to new names"

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

diff --git a/jjb/bgpcep/bgpcep-csit-bgp-ingest-mixed.yaml b/jjb/bgpcep/bgpcep-csit-bgp-ingest-mixed.yaml
index 83e4488918f92067d674ce543d3d3f0a0825cbea..dc8bd41a11521d94cf4c54a99f19995d4de0559f 100644 (file)
--- a/jjb/bgpcep/bgpcep-csit-bgp-ingest-mixed.yaml
+++ b/jjb/bgpcep/bgpcep-csit-bgp-ingest-mixed.yaml
@@ -2,7 +2,7 @@
 - project:
     name: bgpcep-csit-bgp-ingest-mixed
     jobs:
-      - '{project}-csit-1node-periodic-{functionality}-{install}-{stream}'
+      - inttest-csit-1node-periodic
       # FIXME: Rename job to drop -periodic- and unify job definition with -gate- functionality.
 
     # 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:
@@ -32,6 +29,7 @@
     install-features: >
         odl-restconf,
         odl-bgpcep-bgp,
+        odl-bgpcep-bgp-config-example,
         odl-bgpcep-data-change-counter,
         odl-netconf-topology
 
@@ -48,7 +46,7 @@
         -v TEST_DURATION_MULTIPLIER:4
 
     # Controller configuration
-    odl_system_flavor: 8 GB General Purpose v1
+    odl_system_flavor: v1-performance-2
 
     # Plot Info
     01-plot-title: 'Number of generated updates'