X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fbgpcep%2Fbgpcep-csit-bgp-ingest.yaml;h=a7e10c9a700ffa60afc17044848113d7d5101997;hb=fec89881ec40dd1f7d74bfc77e129784daf4ccde;hp=0a299a74b48533e7523e74121c031b5a938041ff;hpb=9fef42ce003874231825076d852d87b00644c3c2;p=releng%2Fbuilder.git

diff --git a/jjb/bgpcep/bgpcep-csit-bgp-ingest.yaml b/jjb/bgpcep/bgpcep-csit-bgp-ingest.yaml
index 0a299a74b..a7e10c9a7 100644
--- a/jjb/bgpcep/bgpcep-csit-bgp-ingest.yaml
+++ b/jjb/bgpcep/bgpcep-csit-bgp-ingest.yaml
@@ -3,6 +3,7 @@
     name: bgpcep-csit-bgp-ingest
     jobs:
       - '{project}-csit-1node-periodic-{functionality}-{install}-{stream}'
+      # FIXME: Dicument differences from -mixed- and unify into single (matrix) definition.
 
     # The project name
     project: 'bgpcep'
@@ -12,36 +13,15 @@
 
     # Project branches
     stream:
-      - nitrogen:
+      - oxygen:
           branch: 'master'
-          jre: 'openjdk8'
+      - nitrogen:
+          branch: 'stable/nitrogen'
       - carbon:
           branch: 'stable/carbon'
-          jre: 'openjdk8'
-          karaf-version: karaf3
-      - boron:
-          branch: 'stable/boron'
-          jre: 'openjdk8'
           karaf-version: karaf3
-          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
 
     install:
-      - only:
-          scope: 'only'
       - all:
           scope: 'all'
 
@@ -51,6 +31,7 @@
         odl-jolokia,
         odl-bgpcep-data-change-counter,
         odl-bgpcep-bgp,
+        odl-bgpcep-bgp-config-example,
         odl-netconf-topology
 
     # Robot custom options:
@@ -65,159 +46,5 @@
         -v TEST_DURATION_MULTIPLIER_CHANGE_COUNT_MANY:8.0
 
     # Controller configuration
-    odl_system_flavor: 8 GB General Purpose v1
-
-- project:
-    name: bgpcep-csit-bgp-ingest-mixed
-    jobs:
-      - '{project}-csit-1node-periodic-{functionality}-{install}-{stream}'
-
-    # The project name
-    project: 'bgpcep'
-
-    # The functionality under test
-    functionality: 'bgp-ingest-mixed'
-
-    # Project branches
-    stream:
-      - nitrogen:
-          branch: 'master'
-          jre: 'openjdk8'
-      - carbon:
-          branch: 'stable/carbon'
-          jre: 'openjdk8'
-          karaf-version: karaf3
-      - boron:
-          branch: 'stable/boron'
-          jre: 'openjdk8'
-          karaf-version: karaf3
-          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
-
-    install:
-      - only:
-          scope: 'only'
-      - all:
-          scope: 'all'
-
-    # Features to install
-    install-features: >
-        odl-restconf,
-        odl-bgpcep-bgp,
-        odl-bgpcep-data-change-counter,
-        odl-netconf-topology
-
-    # 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 USE_NETCONF_CONNECTOR:False
-        -v COUNT:1000000
-        -v INSERT:10
-        -v WITHDRAW:9
-        -v PREFILL:10
-        -v UPDATE:single
-        -v TEST_DURATION_MULTIPLIER:4
-
-    # Controller configuration
-    odl_system_flavor: 8 GB General Purpose v1
-
-    # Plot Info
-    01-plot-title: 'Number of generated updates'
-    01-plot-yaxis: 'Total number of updates'
-    01-plot-group: 'BGP Scaling test suite'
-    01-plot-data-file: 'totals-bgp.csv'
-    02-plot-title: 'Generated load'
-    02-plot-yaxis: 'Updates per second'
-    02-plot-group: 'BGP Scaling test suite'
-    02-plot-data-file: 'performance-bgp.csv'
-
-- project:
-    name: bgpcep-csit-gate-bgp-ingest-mixed
-    jobs:
-      - '{project}-csit-1node-{functionality}-{install}-{stream}'
-
-    # The project name
-    project: 'bgpcep'
-
-    # The functionality under test
-    functionality: 'gate-bgp-ingest-mixed'
-
-    # Project branches
-    stream:
-      - nitrogen:
-          branch: 'master'
-          jre: 'openjdk8'
-      - carbon:
-          branch: 'stable/carbon'
-          jre: 'openjdk8'
-          karaf-version: karaf3
-      - boron:
-          branch: 'stable/boron'
-          jre: 'openjdk8'
-          karaf-version: karaf3
-          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
-
-    install:
-      - only:
-          scope: 'only'
-      - all:
-          scope: 'all'
-
-    # Features to install
-    install-features: >
-        odl-restconf,
-        odl-bgpcep-bgp,
-        odl-bgpcep-data-change-counter,
-        odl-netconf-topology
-
-    # 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 USE_NETCONF_CONNECTOR:False
-        -v COUNT:1000000
-        -v INSERT:10
-        -v WITHDRAW:9
-        -v PREFILL:10
-        -v UPDATE:single
-        -v TEST_DURATION_MULTIPLIER:4
-
-    # Controller configuration
-    odl_system_flavor: 8 GB General Purpose v1
-
-    # Plot Info
-    01-plot-title: 'Number of generated updates'
-    01-plot-yaxis: 'Total number of updates'
-    01-plot-group: 'BGP Scaling test suite'
-    01-plot-data-file: 'totals-bgp.csv'
-    02-plot-title: 'Generated load'
-    02-plot-yaxis: 'Updates per second'
-    02-plot-group: 'BGP Scaling test suite'
-    02-plot-data-file: 'performance-bgp.csv'
+    odl_system_flavor: v1-performance-4