Merge "Update validate autorelease projects for boron"

[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 5ae653324a33f64fd0ee73d309814b5a664ec0b3..c074aa07212249e50d0932d97e6a41a4675b617f 100644 (file)
--- a/jjb/bgpcep/bgpcep-csit-bgp-ingest.yaml
+++ b/jjb/bgpcep/bgpcep-csit-bgp-ingest.yaml
@@ -18,27 +18,11 @@
       - carbon:
           branch: 'stable/carbon'
           jre: 'openjdk8'
+          karaf-version: karaf3
       - boron:
           branch: 'stable/boron'
           jre: 'openjdk8'
-          install-features: >
-              odl-restconf,
-              odl-bgpcep-data-change-counter,
-              odl-bgpcep-bgp-all,
-              odl-bgpcep-bgp,
-              odl-netconf-connector-all
-          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
-      - beryllium:
-          branch: 'stable/beryllium'
-          jre: 'openjdk7'
+          karaf-version: karaf3
           install-features: >
               odl-restconf,
               odl-bgpcep-data-change-counter,
@@ -64,6 +48,7 @@
     # Features to install
     install-features: >
         odl-restconf,
+        odl-jolokia,
         odl-bgpcep-data-change-counter,
         odl-bgpcep-bgp,
         odl-netconf-topology
@@ -99,28 +84,13 @@
           branch: 'master'
           jre: 'openjdk8'
       - carbon:
-          branch: 'satble/carbon'
+          branch: 'stable/carbon'
           jre: 'openjdk8'
+          karaf-version: karaf3
       - boron:
           branch: 'stable/boron'
           jre: 'openjdk8'
-          install-features: >
-              odl-restconf,
-              odl-bgpcep-bgp-all,
-              odl-bgpcep-bgp,
-              odl-bgpcep-data-change-counter,
-              odl-netconf-connector-all
-          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
-      - beryllium:
-          branch: 'stable/beryllium'
-          jre: 'openjdk7'
+          karaf-version: karaf3
           install-features: >
               odl-restconf,
               odl-bgpcep-bgp-all,