From bdfc93b44c6f134a0a82a50cf11aad10cbee33f9 Mon Sep 17 00:00:00 2001 From: Tibor Frank Date: Mon, 30 Mar 2020 07:44:17 +0200 Subject: [PATCH] Report: COnfigure reoirt 2001.14 Change-Id: Ic899dbe5875238c36e83778c413c7943169ef8df Signed-off-by: Tibor Frank (cherry picked from commit 0ed80e392d1ab253af67ab7a46d29804bfe84360) --- 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 1bbc407a37..2b07036143 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 (d4f9e9 CSIT-1597 API cleanup: acl) | .12 | 1. Added data: | +======= +| .14 | 1. Added data: | +>>>>>>> CHANGE (0ed80e Report: COnfigure reoirt 2001.14) | | | | | - VPP performance tests 2n-skx | | | | @@ -20,6 +24,13 @@ FD.io CSIT-2001 Report history and per .[ww] revision changes are listed below. | | 2n-skx and 3n-skx. | | | | +----------------+------------------------------------------------------------+ +<<<<<<< HEAD (d4f9e9 CSIT-1597 API cleanup: acl) +======= +| .13 | Skipped. | ++----------------+------------------------------------------------------------+ +| .12 | Skipped. | ++----------------+------------------------------------------------------------+ +>>>>>>> CHANGE (0ed80e Report: COnfigure reoirt 2001.14) | .11 | 1. Added Soak tests | | | | | | 2. Added data: | diff --git a/resources/tools/presentation/conf.py b/resources/tools/presentation/conf.py index d17140b15e..10889d107e 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 (d4f9e9 CSIT-1597 API cleanup: acl) report_week = u'12' +======= +report_week = u'14' +>>>>>>> CHANGE (0ed80e Report: COnfigure reoirt 2001.14) 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 b246e91ce4..6f31f8c3fa 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 (d4f9e9 CSIT-1597 API cleanup: acl) --week "12" \ +======= + --week "14" \ +>>>>>>> CHANGE (0ed80e Report: COnfigure reoirt 2001.14) --logging INFO \ --force -- 2.16.6