Report: Configure report 2001.16

Change-Id: I909845026c0495db74e0ef82f17d7d14db2ac9d5
Signed-off-by: Tibor Frank <tifrank@cisco.com>
(cherry picked from commit 42a491e80b96ebc81960d395a20dbba192e4066d)
(cherry picked from commit 8f281606dfd1e726b1474a0a50cdc817c2f783c7)

diff --git a/docs/report/introduction/report_history.rst b/docs/report/introduction/report_history.rst
index 691e468..3eb858a 100644 (file)
--- a/docs/report/introduction/report_history.rst
+++ b/docs/report/introduction/report_history.rst
@@ -6,6 +6,7 @@ FD.io CSIT-2001 Report history and per .[ww] revision changes are listed below.
 +----------------+------------------------------------------------------------+
 | .[ww] Revision | Changes                                                    |
 +================+============================================================+
+<<<<<<< HEAD   (b95753 PAL: Fix table data model)
 <<<<<<< HEAD   (ede849 Report: Add pdf version)
 <<<<<<< HEAD   (35a360 Report: Add data)
 =======
@@ -17,13 +18,22 @@ FD.io CSIT-2001 Report history and per .[ww] revision changes are listed below.
 <<<<<<< HEAD   (d4f9e9 CSIT-1597 API cleanup: acl)
 | .12            | 1. Added data:                                             |
 =======
+=======
+<<<<<<< HEAD   (9b9bbb PAL: Fix table data model)
+>>>>>>> CHANGE (8f2816 Report: Configure report 2001.16)
 | .14            | 1. Added data:                                             |
+<<<<<<< HEAD   (b95753 PAL: Fix table data model)
 >>>>>>> CHANGE (0ed80e Report: COnfigure reoirt 2001.14)
 >>>>>>> CHANGE (bdfc93 Report: COnfigure reoirt 2001.14)
 =======
 | .15            | 1. Added data:                                             |
 >>>>>>> CHANGE (8e601d Report: Configure report 2001.15)
 >>>>>>> CHANGE (68013a Report: Configure report 2001.15)
+=======
+=======
+| .16            | 1. Added data:                                             |
+>>>>>>> CHANGE (42a491 Report: Configure report 2001.16)
+>>>>>>> CHANGE (8f2816 Report: Configure report 2001.16)
 |                |                                                            |
 |                |    - VPP performance tests 2n-skx                          |
 |                |                                                            |
@@ -39,6 +49,7 @@ FD.io CSIT-2001 Report history and per .[ww] revision changes are listed below.
 |                |     2n-skx and 3n-skx.                                     |
 |                |                                                            |
 +----------------+------------------------------------------------------------+
+<<<<<<< HEAD   (b95753 PAL: Fix table data model)
 <<<<<<< HEAD   (ede849 Report: Add pdf version)
 <<<<<<< HEAD   (35a360 Report: Add data)
 =======
@@ -55,6 +66,15 @@ FD.io CSIT-2001 Report history and per .[ww] revision changes are listed below.
 =======
 <<<<<<< HEAD   (d4f9e9 CSIT-1597 API cleanup: acl)
 =======
+=======
+<<<<<<< HEAD   (9b9bbb PAL: Fix table data model)
+=======
+| .15            | Skipped.                                                   |
++----------------+------------------------------------------------------------+
+| .14            | Skipped.                                                   |
++----------------+------------------------------------------------------------+
+>>>>>>> CHANGE (42a491 Report: Configure report 2001.16)
+>>>>>>> CHANGE (8f2816 Report: Configure report 2001.16)
 | .13            | Skipped.                                                   |
 +----------------+------------------------------------------------------------+
 | .12            | Skipped.                                                   |

diff --git a/resources/tools/presentation/conf.py b/resources/tools/presentation/conf.py
index 9c70d97..c711b73 100644 (file)
--- a/resources/tools/presentation/conf.py
+++ b/resources/tools/presentation/conf.py
@@ -46,6 +46,7 @@ source_suffix = [u'.rst', u'.md']
 master_doc = u'index'
 
 # General information about the project.
+<<<<<<< HEAD   (b95753 PAL: Fix table data model)
 <<<<<<< HEAD   (ede849 Report: Add pdf version)
 <<<<<<< HEAD   (35a360 Report: Add data)
 =======
@@ -57,13 +58,22 @@ report_week = u'13'
 <<<<<<< HEAD   (d4f9e9 CSIT-1597 API cleanup: acl)
 report_week = u'12'
 =======
+=======
+<<<<<<< HEAD   (9b9bbb PAL: Fix table data model)
+>>>>>>> CHANGE (8f2816 Report: Configure report 2001.16)
 report_week = u'14'
+<<<<<<< HEAD   (b95753 PAL: Fix table data model)
 >>>>>>> CHANGE (0ed80e Report: COnfigure reoirt 2001.14)
 >>>>>>> CHANGE (bdfc93 Report: COnfigure reoirt 2001.14)
 =======
 report_week = u'15'
 >>>>>>> CHANGE (8e601d Report: Configure report 2001.15)
 >>>>>>> CHANGE (68013a Report: Configure report 2001.15)
+=======
+=======
+report_week = u'16'
+>>>>>>> CHANGE (42a491 Report: Configure report 2001.16)
+>>>>>>> CHANGE (8f2816 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 5c4dcfd..165c3fc 100755 (executable)
--- a/resources/tools/presentation/run_report.sh
+++ b/resources/tools/presentation/run_report.sh
@@ -38,6 +38,7 @@ export PYTHONPATH=`pwd`:`pwd`/../../../:`pwd`/../../libraries/python
 python pal.py \
     --specification specification.yaml \
     --release ${RELEASE} \
+<<<<<<< HEAD   (b95753 PAL: Fix table data model)
 <<<<<<< HEAD   (ede849 Report: Add pdf version)
 <<<<<<< HEAD   (35a360 Report: Add data)
 =======
@@ -49,13 +50,22 @@ python pal.py \
 <<<<<<< HEAD   (d4f9e9 CSIT-1597 API cleanup: acl)
     --week "12" \
 =======
+=======
+<<<<<<< HEAD   (9b9bbb PAL: Fix table data model)
+>>>>>>> CHANGE (8f2816 Report: Configure report 2001.16)
     --week "14" \
+<<<<<<< HEAD   (b95753 PAL: Fix table data model)
 >>>>>>> CHANGE (0ed80e Report: COnfigure reoirt 2001.14)
 >>>>>>> CHANGE (bdfc93 Report: COnfigure reoirt 2001.14)
 =======
     --week "15" \
 >>>>>>> CHANGE (8e601d Report: Configure report 2001.15)
 >>>>>>> CHANGE (68013a Report: Configure report 2001.15)
+=======
+=======
+    --week "16" \
+>>>>>>> CHANGE (42a491 Report: Configure report 2001.16)
+>>>>>>> CHANGE (8f2816 Report: Configure report 2001.16)
     --logging INFO \
     --force