From 8f281606dfd1e726b1474a0a50cdc817c2f783c7 Mon Sep 17 00:00:00 2001 From: Tibor Frank Date: Tue, 14 Apr 2020 06:18:03 +0200 Subject: [PATCH] Report: Configure report 2001.16 Change-Id: I909845026c0495db74e0ef82f17d7d14db2ac9d5 Signed-off-by: Tibor Frank (cherry picked from commit 42a491e80b96ebc81960d395a20dbba192e4066d) --- docs/report/introduction/report_history.rst | 11 +++++++++++ resources/tools/presentation/conf.py | 4 ++++ resources/tools/presentation/run_report.sh | 4 ++++ 3 files changed, 19 insertions(+) diff --git a/docs/report/introduction/report_history.rst b/docs/report/introduction/report_history.rst index a8f47a9795..eb83ff9f34 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 (9b9bbb PAL: Fix table data model) | .14 | 1. Added data: | +======= +| .16 | 1. Added data: | +>>>>>>> CHANGE (42a491 Report: Configure report 2001.16) | | | | | - VPP performance tests 2n-skx | | | | @@ -22,6 +26,13 @@ FD.io CSIT-2001 Report history and per .[ww] revision changes are listed below. | | 2n-skx and 3n-skx. | | | | +----------------+------------------------------------------------------------+ +<<<<<<< HEAD (9b9bbb PAL: Fix table data model) +======= +| .15 | Skipped. | ++----------------+------------------------------------------------------------+ +| .14 | Skipped. | ++----------------+------------------------------------------------------------+ +>>>>>>> CHANGE (42a491 Report: Configure report 2001.16) | .13 | Skipped. | +----------------+------------------------------------------------------------+ | .12 | Skipped. | diff --git a/resources/tools/presentation/conf.py b/resources/tools/presentation/conf.py index 4b3688bb27..5f31ee3f0b 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 (9b9bbb PAL: Fix table data model) report_week = u'14' +======= +report_week = u'16' +>>>>>>> CHANGE (42a491 Report: Configure report 2001.16) 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 b4480fe0bc..bbe0b204f7 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 (9b9bbb PAL: Fix table data model) --week "14" \ +======= + --week "16" \ +>>>>>>> CHANGE (42a491 Report: Configure report 2001.16) --logging INFO \ --force -- 2.16.6