From: Tibor Frank <tifrank@cisco.com>
Date: Mon, 6 Apr 2020 04:28:11 +0000 (+0200)
Subject: Report: Configure report 2001.15
X-Git-Url: https://gerrit.fd.io/r/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F70%2F26370%2F1;p=csit.git

Report: Configure report 2001.15

Change-Id: I4926a15e0b89507aad89845e12385ba34adfd68d
Signed-off-by: Tibor Frank <tifrank@cisco.com>
(cherry picked from commit 8e601d0f37f715ca4ce55dded8bc27cadfe175c2)
---

diff --git a/docs/report/introduction/report_history.rst b/docs/report/introduction/report_history.rst
index bb5facc728..24cf8d45df 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   (ef4187 Report: Add pdf version)
 | .13            | 1. Added data:                                             |
+=======
+| .15            | 1. Added data:                                             |
+>>>>>>> CHANGE (8e601d Report: Configure report 2001.15)
 |                |                                                            |
 |                |    - 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   (ef4187 Report: Add pdf version)
+=======
+| .14            | Skipped.                                                   |
++----------------+------------------------------------------------------------+
+| .13            | Skipped.                                                   |
++----------------+------------------------------------------------------------+
+>>>>>>> CHANGE (8e601d Report: Configure report 2001.15)
 | .12            | Skipped.                                                   |
 +----------------+------------------------------------------------------------+
 | .11            | 1. Added Soak tests                                        |
diff --git a/resources/tools/presentation/conf.py b/resources/tools/presentation/conf.py
index a67b6d5be4..9bd3d43ef1 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   (ef4187 Report: Add pdf version)
 report_week = u'13'
+=======
+report_week = u'15'
+>>>>>>> CHANGE (8e601d Report: Configure report 2001.15)
 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 e4d1802f87..e72e365dd4 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   (ef4187 Report: Add pdf version)
     --week "13" \
+=======
+    --week "15" \
+>>>>>>> CHANGE (8e601d Report: Configure report 2001.15)
     --logging INFO \
     --force