From 6df8919916d3a50c686822f097dd0ed83cce7884 Mon Sep 17 00:00:00 2001 From: Tibor Frank Date: Thu, 7 May 2020 10:19:56 +0200 Subject: [PATCH] Report: Configure report 2001.20 Change-Id: Ib0a3190dfd5b216aa9ff93d751fa48cd42cef88f Signed-off-by: Tibor Frank (cherry picked from commit f4c4608a348dbff603a75fb59e36e1ee8daa2b2a) --- docs/report/introduction/report_history.rst | 13 +++++++++++++ resources/tools/presentation/conf.py | 4 ++++ resources/tools/presentation/run_report.sh | 4 ++++ 3 files changed, 21 insertions(+) diff --git a/docs/report/introduction/report_history.rst b/docs/report/introduction/report_history.rst index c064e35534..4c9eeebab2 100644 --- a/docs/report/introduction/report_history.rst +++ b/docs/report/introduction/report_history.rst @@ -6,7 +6,11 @@ FD.io CSIT-2001 Report history and per .[ww] revision changes are listed below. +----------------+------------------------------------------------------------+ | .[ww] Revision | Changes | +================+============================================================+ +<<<<<<< HEAD (d5fe67 Report: Add data) | .18 | 1. Added data: | +======= +| .20 | 1. Added data: | +>>>>>>> CHANGE (f4c460 Report: Configure report 2001.20) | | | | | - VPP performance tests 2n-skx | | | | @@ -18,6 +22,8 @@ FD.io CSIT-2001 Report history and per .[ww] revision changes are listed below. | | - all set selected for analysis and graphs | | | - MRR tests | | | | +| | - test sets: crypto, L2, IPv6, memif | +| | | | | - Hoststack 3n-hsw tests | | | | | | - Reconfiguration Tests 2n-skx | @@ -28,6 +34,13 @@ FD.io CSIT-2001 Report history and per .[ww] revision changes are listed below. | | 2n-skx and 3n-skx. | | | | +----------------+------------------------------------------------------------+ +<<<<<<< HEAD (d5fe67 Report: Add data) +======= +| .19 | Skipped. | ++----------------+------------------------------------------------------------+ +| .18 | Skipped. | ++----------------+------------------------------------------------------------+ +>>>>>>> CHANGE (f4c460 Report: Configure report 2001.20) | .17 | Skipped. | +----------------+------------------------------------------------------------+ | .16 | Skipped. | diff --git a/resources/tools/presentation/conf.py b/resources/tools/presentation/conf.py index ffd4bd642c..c053816f88 100644 --- a/resources/tools/presentation/conf.py +++ b/resources/tools/presentation/conf.py @@ -46,7 +46,11 @@ source_suffix = [u'.rst', u'.md'] master_doc = u'index' # General information about the project. +<<<<<<< HEAD (d5fe67 Report: Add data) report_week = u'18' +======= +report_week = u'20' +>>>>>>> CHANGE (f4c460 Report: Configure report 2001.20) project = u'FD.io CSIT-2001.{week}'.format(week=report_week) copyright = u'2020, FD.io' author = u'FD.io CSIT' diff --git a/resources/tools/presentation/run_report.sh b/resources/tools/presentation/run_report.sh index 16b3a5e04c..5e959f690f 100755 --- a/resources/tools/presentation/run_report.sh +++ b/resources/tools/presentation/run_report.sh @@ -38,7 +38,11 @@ export PYTHONPATH=`pwd`:`pwd`/../../../:`pwd`/../../libraries/python python pal.py \ --specification specification.yaml \ --release ${RELEASE} \ +<<<<<<< HEAD (d5fe67 Report: Add data) --week "18" \ +======= + --week "20" \ +>>>>>>> CHANGE (f4c460 Report: Configure report 2001.20) --logging INFO \ --force -- 2.16.6