Split bgp csit definitions to separate files

CSIT files for ingest and throughpcep jobs
contained multiple segments, but the additional segments
are notorious for not getting updated when new branch is cut.

This time, the throughpcep was updated,
but the two ingest-mixed segments were not.

Added FIXMEs on how to unify similar definitions in future.

Change-Id: I831d2fd497f3029d3e6b80e249b2d1c612e7ea7f
Signed-off-by: Vratko Polak <vrpolak@cisco.com>

diff --git a/jjb/bgpcep/bgpcep-csit-bgp-gate-ingest-mixed.yaml b/jjb/bgpcep/bgpcep-csit-bgp-gate-ingest-mixed.yaml
new file mode 100644 (file)
index 0000000..bdec61e
--- /dev/null
+++ b/jjb/bgpcep/bgpcep-csit-bgp-gate-ingest-mixed.yaml
@@ -0,0 +1,60 @@
+---
+- 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:
+      - oxygen:
+          branch: 'master'
+          jre: 'openjdk8'
+      - nitrogen:
+          branch: 'stable/nitrogen'
+          jre: 'openjdk8'
+      - carbon:
+          branch: 'stable/carbon'
+          jre: 'openjdk8'
+          karaf-version: karaf3
+
+    install:
+      - 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'

diff --git a/jjb/bgpcep/bgpcep-csit-bgp-ingest-mixed.yaml b/jjb/bgpcep/bgpcep-csit-bgp-ingest-mixed.yaml
new file mode 100644 (file)
index 0000000..83e4488
--- /dev/null
+++ b/jjb/bgpcep/bgpcep-csit-bgp-ingest-mixed.yaml
@@ -0,0 +1,61 @@
+---
+- project:
+    name: bgpcep-csit-bgp-ingest-mixed
+    jobs:
+      - '{project}-csit-1node-periodic-{functionality}-{install}-{stream}'
+      # FIXME: Rename job to drop -periodic- and unify job definition with -gate- functionality.
+
+    # The project name
+    project: 'bgpcep'
+
+    # The functionality under test
+    functionality: 'bgp-ingest-mixed'
+
+    # Project branches
+    stream:
+      - oxygen:
+          branch: 'master'
+          jre: 'openjdk8'
+      - nitrogen:
+          branch: 'stable/nitrogen'
+          jre: 'openjdk8'
+      - carbon:
+          branch: 'stable/carbon'
+          jre: 'openjdk8'
+          karaf-version: karaf3
+
+    install:
+      - 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'

diff --git a/jjb/bgpcep/bgpcep-csit-bgp-ingest.yaml b/jjb/bgpcep/bgpcep-csit-bgp-ingest.yaml
index 34d87963907ca743768355a33634ad458efe2eae..3e33e7bf7ccf86ab40a19b22296636d0bdb9563b 100644 (file)
--- 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'
@@ -49,116 +50,3 @@
     # 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
-
-    install:
-      - 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
-
-    install:
-      - 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'

diff --git a/jjb/bgpcep/bgpcep-csit-gate-throughpcep.yaml b/jjb/bgpcep/bgpcep-csit-gate-throughpcep.yaml
new file mode 100644 (file)
index 0000000..93dacfe
--- /dev/null
+++ b/jjb/bgpcep/bgpcep-csit-gate-throughpcep.yaml
@@ -0,0 +1,44 @@
+---
+- project:
+    name: bgpcep-csit-gate-throughpcep
+    jobs:
+      - '{project}-csit-1node-{functionality}-{install}-{stream}'
+
+    # The project name
+    project: 'bgpcep'
+
+    # The functionality under test
+    functionality: 'gate-throughpcep'
+
+    # Project branches
+    stream:
+      - oxygen:
+          branch: 'master'
+          jre: 'openjdk8'
+      - nitrogen:
+          branch: 'stable/nitrogen'
+          jre: 'openjdk8'
+      - carbon:
+          branch: 'stable/carbon'
+          jre: 'openjdk8'
+          karaf-version: karaf3
+
+    install:
+      - all:
+          scope: 'all'
+
+    # Features to install
+    install-features: 'odl-restconf,odl-bgpcep-pcep'
+
+    # Readiness check timeout is lowered from the suite's high default value.
+    # The other options are workarounds for Sandbox not being as performant
+    # as the private lab where this suite was developed.
+    # Robot custom options:
+    robot-options: >
+        -v USE_NETCONF_CONNECTOR:False
+        -v PCEP_READY_VERIFY_TIMEOUT:5
+        -v RESTCONF_REUSE:False
+        -v UPDATER_TIMEOUT:600
+
+    # Controller configuration
+    odl_system_flavor: 8 GB General Purpose v1

diff --git a/jjb/bgpcep/bgpcep-csit-throughpcep.yaml b/jjb/bgpcep/bgpcep-csit-throughpcep.yaml
index 5e4743647b0042a5d4f38959a10c704322590691..a4aa6f86a73926c5eb5097af664b8ee511ff7b4f 100644 (file)
--- a/jjb/bgpcep/bgpcep-csit-throughpcep.yaml
+++ b/jjb/bgpcep/bgpcep-csit-throughpcep.yaml
@@ -3,6 +3,7 @@
     name: bgpcep-csit-throughpcep
     jobs:
       - '{project}-csit-1node-periodic-{functionality}-{install}-{stream}'
+      # FIXME: Rename job to drop -periodic- and unify job definition with -gate- functionality.
 
     # The project name
     project: 'bgpcep'
@@ -42,47 +43,3 @@
 
     # Controller configuration
     odl_system_flavor: 8 GB General Purpose v1
-
-- project:
-    name: bgpcep-csit-gate-throughpcep
-    jobs:
-      - '{project}-csit-1node-{functionality}-{install}-{stream}'
-
-    # The project name
-    project: 'bgpcep'
-
-    # The functionality under test
-    functionality: 'gate-throughpcep'
-
-    # Project branches
-    stream:
-      - oxygen:
-          branch: 'master'
-          jre: 'openjdk8'
-      - nitrogen:
-          branch: 'stable/nitrogen'
-          jre: 'openjdk8'
-      - carbon:
-          branch: 'stable/carbon'
-          jre: 'openjdk8'
-          karaf-version: karaf3
-
-    install:
-      - all:
-          scope: 'all'
-
-    # Features to install
-    install-features: 'odl-restconf,odl-bgpcep-pcep'
-
-    # Readiness check timeout is lowered from the suite's high default value.
-    # The other options are workarounds for Sandbox not being as performant
-    # as the private lab where this suite was developed.
-    # Robot custom options:
-    robot-options: >
-        -v USE_NETCONF_CONNECTOR:False
-        -v PCEP_READY_VERIFY_TIMEOUT:5
-        -v RESTCONF_REUSE:False
-        -v UPDATER_TIMEOUT:600
-
-    # Controller configuration
-    odl_system_flavor: 8 GB General Purpose v1