Report: Configure report 2001.19

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

diff --git a/resources/tools/presentation/conf.py b/resources/tools/presentation/conf.py
index aa4478d..8c62135 100644 (file)
--- a/resources/tools/presentation/conf.py
+++ b/resources/tools/presentation/conf.py
@@ -46,7 +46,42 @@ source_suffix = [u'.rst', u'.md']
 master_doc = u'index'
 
 # General information about the project.
-report_week = u'05'
+<<<<<<< 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)
+<<<<<<< HEAD   (35a360 Report: Add data)
+=======
+<<<<<<< HEAD   (ef4187 Report: Add pdf version)
+>>>>>>> CHANGE (68013a Report: Configure report 2001.15)
+report_week = u'13'
+=======
+<<<<<<< HEAD   (ede849 Report: Add pdf version)
+<<<<<<< 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)
+=======
+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'
@@ -67,7 +102,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
@@ -80,7 +116,7 @@ rst_epilog = u"""
 .. _VPP test framework documentation: https://docs.fd.io/vpp/{vpprelease}/vpp_make_test/html/
 .. _FD.io CSIT Testbeds - Xeon Haswell: https://git.fd.io/csit/tree/docs/lab/testbeds_ucs_hsw_hw_bios_cfg.md?h={release}
 .. _FD.io CSIT testbeds - Xeon Skylake, Arm, Atom: https://git.fd.io/csit/tree/docs/lab/testbeds_sm_skx_hw_bios_cfg.md?h={release}
-.. _FD.io CSIT testbeds - Xeon Cascadelake: https://git.fd.io/csit/tree/docs/lab/testbeds_sm_clx_hw_bios_cfg.md?h={release}
+.. _FD.io CSIT testbeds - Xeon Cascade Lake: https://git.fd.io/csit/tree/docs/lab/testbeds_sm_clx_hw_bios_cfg.md?h={release}
 .. _Ansible inventory - hosts: https://git.fd.io/csit/tree/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars?h={release}
 .. _FD.io test executor dpdk performance job 3n-hsw: https://jenkins.fd.io/view/csit/job/csit-dpdk-perf-verify-{srelease}-3n-hsw
 .. _FD.io test executor dpdk performance job 3n-skx: https://jenkins.fd.io/view/csit/job/csit-dpdk-perf-verify-{srelease}-3n-skx
@@ -106,9 +142,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.