Report: Configure report 2001.16

[csit.git] / resources / tools / presentation / conf.py

diff --git a/resources/tools/presentation/conf.py b/resources/tools/presentation/conf.py
index 55807c2..5f31ee3 100644 (file)
--- 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.
-report_week = u'05'
+<<<<<<< HEAD   (9b9bbb PAL: Fix table data model)
+report_week = u'14'
+=======
+report_week = u'16'
+>>>>>>> CHANGE (42a491 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'
@@ -67,7 +71,8 @@ rst_epilog = u"""
 .. |csit-release-1| replace:: CSIT-{csit_prev_release}
 .. |vpp-release| replace:: VPP-{vpprelease} release
 .. |vpp-release-1| replace:: VPP-{vpp_prev_release} release
-.. |dpdk-release| replace:: DPDK {dpdkrelease}
+.. |dpdk-release| replace:: DPDK-{dpdkrelease}
+.. |dpdk-release-1| replace:: DPDK-{dpdk_prev_release}
 .. |trex-release| replace:: TRex {trex_version}
 
 .. _pdf version of this report: https://docs.fd.io/csit/{release}/report/_static/archive/csit_{release}.{report_week}.pdf
@@ -106,9 +111,10 @@ rst_epilog = u"""
            vpprelease=u'20.01',
            vpp_prev_release=u'19.08',
            dpdkrelease=u'19.08',
+           dpdk_prev_release=u'19.05',
            sdpdkrelease=u'1908',
            trex_version=u'v2.73',
-           vpp_release_commit_id=u'1c586de48cc76fc6eac50f5d87003e2a80aa43e7')
+           vpp_release_commit_id=u'fce396738f865293f0a023bc7f172086f81da456')
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.