Report: Configure report 2001.19

Change-Id: I42d2723745a119667b8af2165fbd99dc4fe3cc3e
Signed-off-by: Tibor Frank <tifrank@cisco.com>
(cherry picked from commit fada1fcb4e27d948bbcb2c6aa7e50347e953c898)
(cherry picked from commit 413f1d8cef8290a5c44d836f2bc4611eeac2e2e2)

diff --git a/docs/report/introduction/report_history.rst b/docs/report/introduction/report_history.rst
index e96892b..44164cf 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   (953d13 Report: Fix typo in specification.)
 <<<<<<< HEAD   (793b6b Report: Add data)
 <<<<<<< HEAD   (b95753 PAL: Fix table data model)
 <<<<<<< HEAD   (ede849 Report: Add pdf version)
@@ -38,6 +39,9 @@ FD.io CSIT-2001 Report history and per .[ww] revision changes are listed below.
 =======
 | .18            | 1. Added data:                                             |
 >>>>>>> CHANGE (dfd4a2 Report: Configure Report 2001.18)
+=======
+| .19            | 1. Added data:                                             |
+>>>>>>> CHANGE (413f1d Report: Configure report 2001.19)
 |                |                                                            |
 |                |    - VPP performance tests 2n-skx                          |
 |                |                                                            |
@@ -62,6 +66,7 @@ FD.io CSIT-2001 Report history and per .[ww] revision changes are listed below.
 |                |     2n-skx and 3n-skx.                                     |
 |                |                                                            |
 +----------------+------------------------------------------------------------+
+<<<<<<< HEAD   (953d13 Report: Fix typo in specification.)
 <<<<<<< HEAD   (793b6b Report: Add data)
 <<<<<<< HEAD   (b95753 PAL: Fix table data model)
 <<<<<<< HEAD   (ede849 Report: Add pdf version)
@@ -70,6 +75,10 @@ FD.io CSIT-2001 Report history and per .[ww] revision changes are listed below.
 <<<<<<< HEAD   (ef4187 Report: Add pdf version)
 =======
 =======
+=======
+| .18            | Skipped.                                                   |
++----------------+------------------------------------------------------------+
+>>>>>>> CHANGE (413f1d Report: Configure report 2001.19)
 | .17            | Skipped.                                                   |
 +----------------+------------------------------------------------------------+
 | .16            | Skipped.                                                   |

diff --git a/resources/tools/presentation/conf.py b/resources/tools/presentation/conf.py
index 2643146..8c62135 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   (953d13 Report: Fix typo in specification.)
 <<<<<<< HEAD   (793b6b Report: Add data)
 <<<<<<< HEAD   (b95753 PAL: Fix table data model)
 <<<<<<< HEAD   (ede849 Report: Add pdf version)
@@ -78,6 +79,9 @@ report_week = u'16'
 =======
 report_week = u'18'
 >>>>>>> CHANGE (dfd4a2 Report: Configure Report 2001.18)
+=======
+report_week = u'19'
+>>>>>>> CHANGE (413f1d Report: Configure report 2001.19)
 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 3dcd1ad..9a611c5 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   (953d13 Report: Fix typo in specification.)
 <<<<<<< HEAD   (793b6b Report: Add data)
 <<<<<<< HEAD   (b95753 PAL: Fix table data model)
 <<<<<<< HEAD   (ede849 Report: Add pdf version)
@@ -70,6 +71,9 @@ python pal.py \
 =======
     --week "18" \
 >>>>>>> CHANGE (dfd4a2 Report: Configure Report 2001.18)
+=======
+    --week "19" \
+>>>>>>> CHANGE (413f1d Report: Configure report 2001.19)
     --logging INFO \
     --force