aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--docs/report/introduction/report_history.rst25
-rw-r--r--resources/tools/presentation/conf.py10
-rwxr-xr-xresources/tools/presentation/run_report.sh10
3 files changed, 45 insertions, 0 deletions
diff --git a/docs/report/introduction/report_history.rst b/docs/report/introduction/report_history.rst
index 44164cf34c..6e9708f85f 100644
--- 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 (c842ea Report: Add data)
<<<<<<< HEAD (953d13 Report: Fix typo in specification.)
<<<<<<< HEAD (793b6b Report: Add data)
<<<<<<< HEAD (b95753 PAL: Fix table data model)
@@ -37,11 +38,20 @@ FD.io CSIT-2001 Report history and per .[ww] revision changes are listed below.
>>>>>>> CHANGE (42a491 Report: Configure report 2001.16)
>>>>>>> CHANGE (8f2816 Report: Configure report 2001.16)
=======
+=======
+<<<<<<< HEAD (d5fe67 Report: Add data)
+>>>>>>> CHANGE (6df891 Report: Configure report 2001.20)
| .18 | 1. Added data: |
+<<<<<<< HEAD (c842ea Report: Add data)
>>>>>>> CHANGE (dfd4a2 Report: Configure Report 2001.18)
=======
| .19 | 1. Added data: |
>>>>>>> CHANGE (413f1d Report: Configure report 2001.19)
+=======
+=======
+| .20 | 1. Added data: |
+>>>>>>> CHANGE (f4c460 Report: Configure report 2001.20)
+>>>>>>> CHANGE (6df891 Report: Configure report 2001.20)
| | |
| | - VPP performance tests 2n-skx |
| | |
@@ -53,8 +63,13 @@ FD.io CSIT-2001 Report history and per .[ww] revision changes are listed below.
| | - all set selected for analysis and graphs |
| | - MRR tests |
| | |
+<<<<<<< HEAD (c842ea Report: Add data)
<<<<<<< HEAD (bd7b2e Report: Comparison tables)
=======
+=======
+| | - test sets: crypto, L2, IPv6, memif |
+| | |
+>>>>>>> CHANGE (6df891 Report: Configure report 2001.20)
| | - Hoststack 3n-hsw tests |
| | |
| | - Reconfiguration Tests 2n-skx |
@@ -66,6 +81,7 @@ FD.io CSIT-2001 Report history and per .[ww] revision changes are listed below.
| | 2n-skx and 3n-skx. |
| | |
+----------------+------------------------------------------------------------+
+<<<<<<< HEAD (c842ea Report: Add data)
<<<<<<< HEAD (953d13 Report: Fix typo in specification.)
<<<<<<< HEAD (793b6b Report: Add data)
<<<<<<< HEAD (b95753 PAL: Fix table data model)
@@ -79,6 +95,15 @@ FD.io CSIT-2001 Report history and per .[ww] revision changes are listed below.
| .18 | Skipped. |
+----------------+------------------------------------------------------------+
>>>>>>> CHANGE (413f1d Report: Configure report 2001.19)
+=======
+<<<<<<< HEAD (d5fe67 Report: Add data)
+=======
+| .19 | Skipped. |
++----------------+------------------------------------------------------------+
+| .18 | Skipped. |
++----------------+------------------------------------------------------------+
+>>>>>>> CHANGE (f4c460 Report: Configure report 2001.20)
+>>>>>>> CHANGE (6df891 Report: Configure report 2001.20)
| .17 | Skipped. |
+----------------+------------------------------------------------------------+
| .16 | Skipped. |
diff --git a/resources/tools/presentation/conf.py b/resources/tools/presentation/conf.py
index 8c621357b7..1c37e47659 100644
--- 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 (c842ea Report: Add data)
<<<<<<< HEAD (953d13 Report: Fix typo in specification.)
<<<<<<< HEAD (793b6b Report: Add data)
<<<<<<< HEAD (b95753 PAL: Fix table data model)
@@ -77,11 +78,20 @@ report_week = u'16'
>>>>>>> CHANGE (42a491 Report: Configure report 2001.16)
>>>>>>> CHANGE (8f2816 Report: Configure report 2001.16)
=======
+=======
+<<<<<<< HEAD (d5fe67 Report: Add data)
+>>>>>>> CHANGE (6df891 Report: Configure report 2001.20)
report_week = u'18'
+<<<<<<< HEAD (c842ea Report: Add data)
>>>>>>> CHANGE (dfd4a2 Report: Configure Report 2001.18)
=======
report_week = u'19'
>>>>>>> CHANGE (413f1d Report: Configure report 2001.19)
+=======
+=======
+report_week = u'20'
+>>>>>>> CHANGE (f4c460 Report: Configure report 2001.20)
+>>>>>>> CHANGE (6df891 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 9a611c52e0..6149388d91 100755
--- 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 (c842ea Report: Add data)
<<<<<<< HEAD (953d13 Report: Fix typo in specification.)
<<<<<<< HEAD (793b6b Report: Add data)
<<<<<<< HEAD (b95753 PAL: Fix table data model)
@@ -69,11 +70,20 @@ python pal.py \
>>>>>>> CHANGE (42a491 Report: Configure report 2001.16)
>>>>>>> CHANGE (8f2816 Report: Configure report 2001.16)
=======
+=======
+<<<<<<< HEAD (d5fe67 Report: Add data)
+>>>>>>> CHANGE (6df891 Report: Configure report 2001.20)
--week "18" \
+<<<<<<< HEAD (c842ea Report: Add data)
>>>>>>> CHANGE (dfd4a2 Report: Configure Report 2001.18)
=======
--week "19" \
>>>>>>> CHANGE (413f1d Report: Configure report 2001.19)
+=======
+=======
+ --week "20" \
+>>>>>>> CHANGE (f4c460 Report: Configure report 2001.20)
+>>>>>>> CHANGE (6df891 Report: Configure report 2001.20)
--logging INFO \
--force