Unify Bgpcep gate jobs

Some of the jobs are failing due to
different or unnecessary configuration.

Change-Id: I558890cdf42083801440ca2f795af182fde69f68
Signed-off-by: Tomas Markovic <tomas.markovic@pantheon.tech>

diff --git a/jjb/bgpcep/bgpcep-csit-bgp-gate-ingest-mixed.yaml b/jjb/bgpcep/bgpcep-csit-bgp-gate-ingest-mixed.yaml
deleted file mode 100644 (file)
index e71dd3e..0000000
--- a/jjb/bgpcep/bgpcep-csit-bgp-gate-ingest-mixed.yaml
+++ /dev/null
@@ -1,54 +0,0 @@
----
-- project:
-    name: bgpcep-csit-gate-bgp-ingest-mixed
-    jobs:
-      - inttest-csit-1node
-
-    # The project name
-    project: 'bgpcep'
-
-    # The functionality under test
-    functionality: 'gate-bgp-ingest-mixed'
-
-    # Project branches
-    stream:
-      - fluorine:
-          branch: 'master'
-      - oxygen:
-          branch: 'stable/oxygen'
-
-    install:
-      - all:
-          scope: 'all'
-
-    # Features to install
-    install-features: >
-        odl-restconf,
-        odl-bgpcep-bgp,
-        odl-bgpcep-bgp-config-example,
-        odl-bgpcep-data-change-counter
-
-    # 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: odl-standard-4
-
-    # 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
index da0f2ffb0f079c51aaae0c31b94e4e638db89b38..846e07ad0c4825e4aadff15aff71aee8fad5c274 100644 (file)
--- a/jjb/bgpcep/bgpcep-csit-bgp-ingest-mixed.yaml
+++ b/jjb/bgpcep/bgpcep-csit-bgp-ingest-mixed.yaml
@@ -3,13 +3,14 @@
     name: bgpcep-csit-bgp-ingest-mixed
     jobs:
       - inttest-csit-1node
-      # 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'
+    functionality:
+      - bgp-ingest-mixed
+      - gate-bgp-ingest-mixed
 
     # Project branches
     stream:
@@ -42,7 +43,7 @@
         -v TEST_DURATION_MULTIPLIER:4
 
     # Controller configuration
-    odl_system_flavor: odl-standard-2
+    odl_system_flavor: odl-standard-4
 
     # Plot Info
     01-plot-title: 'Number of generated updates'

diff --git a/jjb/bgpcep/bgpcep-csit-gate-throughpcep.yaml b/jjb/bgpcep/bgpcep-csit-gate-throughpcep.yaml
deleted file mode 100644 (file)
index b902204..0000000
--- a/jjb/bgpcep/bgpcep-csit-gate-throughpcep.yaml
+++ /dev/null
@@ -1,38 +0,0 @@
----
-- project:
-    name: bgpcep-csit-gate-throughpcep
-    jobs:
-      - inttest-csit-1node
-
-    # The project name
-    project: 'bgpcep'
-
-    # The functionality under test
-    functionality: 'gate-throughpcep'
-
-    # Project branches
-    stream:
-      - fluorine:
-          branch: 'master'
-      - oxygen:
-          branch: 'stable/oxygen'
-
-    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: odl-standard-4

diff --git a/jjb/bgpcep/bgpcep-csit-throughpcep.yaml b/jjb/bgpcep/bgpcep-csit-throughpcep.yaml
index 0874aa7d6a2c5c2a211c70bf75eb6402280b6d16..986e53e2964a7e8eb74bc636d805c3c6ea713aa7 100644 (file)
--- a/jjb/bgpcep/bgpcep-csit-throughpcep.yaml
+++ b/jjb/bgpcep/bgpcep-csit-throughpcep.yaml
@@ -3,13 +3,14 @@
     name: bgpcep-csit-throughpcep
     jobs:
       - inttest-csit-1node
-      # FIXME: Rename job to drop -periodic- and unify job definition with -gate- functionality.
 
     # The project name
     project: 'bgpcep'
 
     # The functionality under test
-    functionality: 'throughpcep'
+    functionality:
+      - throughpcep
+      - gate-throughpcep
 
     # Project branches
     stream: