aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--resources/tools/presentation/generator_tables.py25
-rw-r--r--resources/tools/presentation/specification_CPTA.yaml6
2 files changed, 21 insertions, 10 deletions
diff --git a/resources/tools/presentation/generator_tables.py b/resources/tools/presentation/generator_tables.py
index a3373db6d8..7590daa8fe 100644
--- a/resources/tools/presentation/generator_tables.py
+++ b/resources/tools/presentation/generator_tables.py
@@ -23,6 +23,8 @@ from string import replace
from collections import OrderedDict
from numpy import nan, isnan
from xml.etree import ElementTree as ET
+from datetime import datetime as dt
+from datetime import timedelta
from utils import mean, stdev, relative_change, classify_anomalies, \
convert_csv_to_pretty_txt
@@ -765,6 +767,10 @@ def table_failed_tests(table, input_data):
# Generate the data for the table according to the model in the table
# specification
+
+ now = dt.utcnow()
+ timeperiod = timedelta(int(table.get("window", 7)))
+
tbl_dict = dict()
for job, builds in table["data"].items():
for build in builds:
@@ -781,19 +787,24 @@ def table_failed_tests(table, input_data):
"name": "{0}-{1}".format(nic, tst_data["name"]),
"data": OrderedDict()}
try:
- tbl_dict[tst_name]["data"][build] = (
- tst_data["status"],
- input_data.metadata(job, build).get("generated", ""),
- input_data.metadata(job, build).get("version", ""),
- build)
+ generated = input_data.metadata(job, build).\
+ get("generated", "")
+ if not generated:
+ continue
+ then = dt.strptime(generated, "%Y%m%d %H:%M")
+ if (now - then) <= timeperiod:
+ tbl_dict[tst_name]["data"][build] = (
+ tst_data["status"],
+ generated,
+ input_data.metadata(job, build).get("version", ""),
+ build)
except (TypeError, KeyError):
pass # No data in output.xml for this test
tbl_lst = list()
for tst_data in tbl_dict.values():
- win_size = min(len(tst_data["data"]), table["window"])
fails_nr = 0
- for val in tst_data["data"].values()[-win_size:]:
+ for val in tst_data["data"].values():
if val[0] == "FAIL":
fails_nr += 1
fails_last_date = val[1]
diff --git a/resources/tools/presentation/specification_CPTA.yaml b/resources/tools/presentation/specification_CPTA.yaml
index 90824c0e50..9519614f5d 100644
--- a/resources/tools/presentation/specification_CPTA.yaml
+++ b/resources/tools/presentation/specification_CPTA.yaml
@@ -418,7 +418,7 @@
# This test is "ndrdisc" test and was improperly tagged. It was fixed
# but it remains in the old output.xml files.
- "tests.vpp.perf.l2.10ge2p1x520-eth-l2bdscale1mmaclrn-mrr.tc01-64b-1t1c-eth-l2bdscale1mmaclrn-ndrdisc"
- window: 14
+ window: 7 # days
-
type: "table"
@@ -533,7 +533,7 @@
# This test is "ndrdisc" test and was improperly tagged. It was fixed
# but it remains in the old output.xml files.
- "tests.vpp.perf.l2.10ge2p1x520-eth-l2bdscale1mmaclrn-mrr.tc01-64b-2t1c-eth-l2bdscale1mmaclrn-ndrdisc"
- window: 14
+ window: 7 # days
-
type: "table"
@@ -648,7 +648,7 @@
# This test is "ndrdisc" test and was improperly tagged. It was fixed
# but it remains in the old output.xml files.
- "tests.vpp.perf.l2.10ge2p1x520-eth-l2bdscale1mmaclrn-mrr.tc01-64b-2t1c-eth-l2bdscale1mmaclrn-ndrdisc"
- window: 14
+ window: 7 # days
-
type: "table"