From e0ad96405ff315c84dfb14ef5ab1928b06335c6f Mon Sep 17 00:00:00 2001 From: Tibor Frank Date: Thu, 9 Jan 2020 10:11:55 +0100 Subject: [PATCH] Report: Configure Report 2001 Change-Id: I5ef3c37cf329b76a1a7f94d60c3563872eef3c5d Signed-off-by: Tibor Frank --- docs/report/index.html.template | 2 +- docs/report/index.pdf.template | 2 +- docs/report/introduction/methodology.rst | 3 -- .../methodology_trex_traffic_generator.rst | 2 +- docs/report/introduction/report_history.rst | 28 +------------- docs/report/introduction/test_environment_tg.rst | 2 +- .../vpp_functional_configuration/index.rst | 7 ---- .../vpp_functional_configuration_centos/index.rst | 12 ------ .../vpp_functional_configuration_ubuntu/index.rst | 12 ------ resources/tools/presentation/conf.py | 44 +++++++++------------- resources/tools/presentation/conf_cpta/conf.py | 2 +- resources/tools/presentation/run_report.sh | 2 +- 12 files changed, 25 insertions(+), 93 deletions(-) delete mode 100644 docs/report/test_configuration/vpp_functional_configuration/index.rst delete mode 100644 docs/report/test_configuration/vpp_functional_configuration_centos/index.rst delete mode 100644 docs/report/test_configuration/vpp_functional_configuration_ubuntu/index.rst diff --git a/docs/report/index.html.template b/docs/report/index.html.template index ce90001367..afcc5c7836 100644 --- a/docs/report/index.html.template +++ b/docs/report/index.html.template @@ -1,4 +1,4 @@ -CSIT-1908 +CSIT-2001 ========= .. toctree:: diff --git a/docs/report/index.pdf.template b/docs/report/index.pdf.template index c01d83e803..a43be43ad9 100644 --- a/docs/report/index.pdf.template +++ b/docs/report/index.pdf.template @@ -1,4 +1,4 @@ -CSIT-1908 +CSIT-2001 ========= .. toctree:: diff --git a/docs/report/introduction/methodology.rst b/docs/report/introduction/methodology.rst index 5c54bb9d84..ff3ecc31a4 100644 --- a/docs/report/introduction/methodology.rst +++ b/docs/report/introduction/methodology.rst @@ -11,9 +11,6 @@ Test Methodology methodology_tunnel_encapsulations methodology_vpp_features methodology_data_plane_throughput/index - methodology_mlrsearch_tests - methodology_mrr_throughput - methodology_plrsearch methodology_packet_latency methodology_multi_core_speedup methodology_reconf diff --git a/docs/report/introduction/methodology_trex_traffic_generator.rst b/docs/report/introduction/methodology_trex_traffic_generator.rst index 918a34f73d..0e7049826b 100644 --- a/docs/report/introduction/methodology_trex_traffic_generator.rst +++ b/docs/report/introduction/methodology_trex_traffic_generator.rst @@ -13,7 +13,7 @@ TRex is installed and run on the TG compute node. The typical procedure is: - If the TRex is not already installed on TG, it is installed in the - suite setup phase - see `TRex intallation`_. + suite setup phase - see `TRex installation`_. - TRex configuration is set in its configuration file :: diff --git a/docs/report/introduction/report_history.rst b/docs/report/introduction/report_history.rst index 64f7c24561..93935731a4 100644 --- a/docs/report/introduction/report_history.rst +++ b/docs/report/introduction/report_history.rst @@ -1,36 +1,12 @@ Report History ============== -FD.io CSIT-1908 Report history and per .[ww] revision changes are listed below. +FD.io CSIT-2001 Report history and per .[ww] revision changes are listed below. +----------------+------------------------------------------------------------+ | .[ww] Revision | Changes | +================+============================================================+ -| .38 | 1. Added data: | -| | | -| | - NFV Density, 2n-skx | -| | - NFV Density with reconfiguration, 2n-skx | -| | - VPP performance MRR, 3n-tsh | -| | | -| | 2. Added plots: | -| | | -| | - Reconfiguration of VNF Service Chains | -| | | -| | 3. Added methodology for :ref:`reconf_tests` | -| | | -+----------------+------------------------------------------------------------+ -| .37 | 1. Fixes in comparison tables. | -| | | -| | 2. Added data: | -| | | -| | - 2n-dnv and 3n-dnv, ndrpdr and mrr | -| | - soak tests | -| | - 2n-skx, 3n-skx and 3n-hsw, ndrpdr | -| | | -| | 3. Added Vhost data for 2n-skx, 3n-skx and 3n-hsw, ndrpdr | -| | | -+----------------+------------------------------------------------------------+ -| .36 | Initial version | +| .05 | Initial version | | | | +----------------+------------------------------------------------------------+ diff --git a/docs/report/introduction/test_environment_tg.rst b/docs/report/introduction/test_environment_tg.rst index 60dc81270b..d49ea825bd 100644 --- a/docs/report/introduction/test_environment_tg.rst +++ b/docs/report/introduction/test_environment_tg.rst @@ -14,7 +14,7 @@ DPDK v19.02 TG Build Script Used ~~~~~~~~~~~~~~~~~~~~ -`TRex intallation`_ +`TRex installation`_ TG Startup Configuration ~~~~~~~~~~~~~~~~~~~~~~~~ diff --git a/docs/report/test_configuration/vpp_functional_configuration/index.rst b/docs/report/test_configuration/vpp_functional_configuration/index.rst deleted file mode 100644 index 93f4c5c40a..0000000000 --- a/docs/report/test_configuration/vpp_functional_configuration/index.rst +++ /dev/null @@ -1,7 +0,0 @@ -VPP Functional -============== - -.. toctree:: - - ../vpp_functional_configuration_ubuntu/index - ../vpp_functional_configuration_centos/index diff --git a/docs/report/test_configuration/vpp_functional_configuration_centos/index.rst b/docs/report/test_configuration/vpp_functional_configuration_centos/index.rst deleted file mode 100644 index 9288ed7277..0000000000 --- a/docs/report/test_configuration/vpp_functional_configuration_centos/index.rst +++ /dev/null @@ -1,12 +0,0 @@ -CentOS ------- - -.. note:: - - Data sources for reported test configurations: i) `FD.io test executor vpp - functional jobs using CentOs`_, ii) archived FD.io jobs test result - `output files <../../_static/archive/>`_. - -.. toctree:: - - vpp_functional_configuration_centos diff --git a/docs/report/test_configuration/vpp_functional_configuration_ubuntu/index.rst b/docs/report/test_configuration/vpp_functional_configuration_ubuntu/index.rst deleted file mode 100644 index 7d82cec79c..0000000000 --- a/docs/report/test_configuration/vpp_functional_configuration_ubuntu/index.rst +++ /dev/null @@ -1,12 +0,0 @@ -Ubuntu ------- - -.. note:: - - Data sources for reported test configurations: i) `FD.io test executor vpp - functional jobs using Ubuntu`_, ii) archived FD.io jobs test result - `output files <../../_static/archive/>`_. - -.. toctree:: - - vpp_functional_configuration_ubuntu diff --git a/resources/tools/presentation/conf.py b/resources/tools/presentation/conf.py index aa1fb797cd..aa4478d24d 100644 --- a/resources/tools/presentation/conf.py +++ b/resources/tools/presentation/conf.py @@ -46,8 +46,8 @@ source_suffix = [u'.rst', u'.md'] master_doc = u'index' # General information about the project. -report_week = u'38' -project = u'FD.io CSIT-1908.{week}'.format(week=report_week) +report_week = u'05' +project = u'FD.io CSIT-2001.{week}'.format(week=report_week) copyright = u'2020, FD.io' author = u'FD.io CSIT' @@ -69,19 +69,12 @@ rst_epilog = u""" .. |vpp-release-1| replace:: VPP-{vpp_prev_release} release .. |dpdk-release| replace:: DPDK {dpdkrelease} .. |trex-release| replace:: TRex {trex_version} -.. |virl-image-ubuntu| replace:: {csit_ubuntu_ver} -.. |virl-image-centos| replace:: {csit_centos_ver} .. _pdf version of this report: https://docs.fd.io/csit/{release}/report/_static/archive/csit_{release}.{report_week}.pdf .. _tag documentation rst file: https://git.fd.io/csit/tree/docs/tag_documentation.rst?h={release} -.. _TRex intallation: https://git.fd.io/csit/tree/resources/tools/trex/trex_installer.sh?h={release} +.. _TRex installation: https://git.fd.io/csit/tree/resources/tools/trex/trex_installer.sh?h={release} .. _TRex driver: https://git.fd.io/csit/tree/resources/tools/trex/trex_stateless_profile.py?h={release} -.. _VIRL topologies directory: https://git.fd.io/csit/tree/resources/tools/virl/topologies/?h={release} -.. _VIRL ubuntu images lists: https://git.fd.io/csit/tree/resources/tools/disk-image-builder/ubuntu/lists/?h={release} -.. _VIRL centos images lists: https://git.fd.io/csit/tree/resources/tools/disk-image-builder/centos/lists/?h={release} -.. _VIRL nested: https://git.fd.io/csit/tree/resources/tools/disk-image-builder/nested/?h={release} .. _CSIT DPDK Performance Tests Documentation: https://docs.fd.io/csit/{release}/doc/tests.dpdk.perf.html -.. _CSIT VPP Functional Tests Documentation: https://docs.fd.io/csit/{release}/doc/tests.vpp.func.html .. _CSIT VPP Performance Tests Documentation: https://docs.fd.io/csit/{release}/doc/tests.vpp.perf.html .. _CSIT VPP Device Tests Documentation: https://docs.fd.io/csit/{release}/doc/tests.vpp.device.html .. _VPP test framework documentation: https://docs.fd.io/vpp/{vpprelease}/vpp_make_test/html/ @@ -92,32 +85,29 @@ rst_epilog = u""" .. _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 .. _FD.io test executor dpdk performance job 2n-skx: https://jenkins.fd.io/view/csit/job/csit-dpdk-perf-verify-{srelease}-2n-skx +.. _FD.io test executor dpdk performance job 2n-clx: https://jenkins.fd.io/view/csit/job/csit-dpdk-perf-verify-{srelease}-2n-clx .. _FD.io test executor vpp performance job 3n-hsw: https://jenkins.fd.io/view/csit/job/csit-vpp-perf-verify-{srelease}-3n-hsw .. _FD.io test executor vpp performance job 3n-skx: https://jenkins.fd.io/view/csit/job/csit-vpp-perf-verify-{srelease}-3n-skx .. _FD.io test executor vpp performance job 2n-skx: https://jenkins.fd.io/view/csit/job/csit-vpp-perf-verify-{srelease}-2n-skx .. _FD.io test executor vpp performance job 3n-tsh: https://jenkins.fd.io/view/csit/job/csit-vpp-perf-verify-{srelease}-3n-tsh .. _FD.io test executor vpp performance job 3n-dnv: https://jenkins.fd.io/view/csit/job/csit-vpp-perf-verify-{srelease}-3n-dnv .. _FD.io test executor vpp performance job 2n-dnv: https://jenkins.fd.io/view/csit/job/csit-vpp-perf-verify-{srelease}-2n-dnv -.. _FD.io test executor vpp functional jobs using Ubuntu: https://jenkins.fd.io/view/csit/job/csit-vpp-functional-{srelease}-ubuntu1604-virl -.. _FD.io test executor vpp functional jobs using CentOs: https://jenkins.fd.io/view/csit/job/csit-vpp-functional-{srelease}-centos7-virl +.. _FD.io test executor vpp performance job 2n-clx: https://jenkins.fd.io/view/csit/job/csit-vpp-perf-verify-{srelease}-2n-clx .. _FD.io test executor vpp device jobs using Ubuntu: https://jenkins.fd.io/view/csit/job/csit-vpp-device-{srelease}-ubuntu1804-1n-skx -.. _FD.io VPP compile job: https://jenkins.fd.io/view/vpp/job/vpp-merge-{srelease}-ubuntu1604/ -.. _FD.io DPDK compile job: https://jenkins.fd.io/view/deb-dpdk/job/deb_dpdk-merge-{sdpdkrelease}-ubuntu1604/ +.. _FD.io VPP compile job: https://jenkins.fd.io/view/vpp/job/vpp-merge-{srelease}-ubuntu1804/ .. _CSIT Testbed Setup: https://git.fd.io/csit/tree/resources/tools/testbed-setup/README.md?h={release} .. _VPP startup.conf: https://git.fd.io/vpp/tree/src/vpp/conf/startup.conf?h=stable/{srelease}&id={vpp_release_commit_id} -""".format(release=u'rls1908', +""".format(release=u'rls2001', report_week=report_week, - prev_release=u'rls1904', - srelease=u'1908', - csitrelease=u'1908', - csit_prev_release=u'1904', - vpprelease=u'19.08', - vpp_prev_release=u'19.04', - dpdkrelease=u'19.05', - sdpdkrelease=u'1905', - trex_version=u'v2.54', - csit_ubuntu_ver=u'csit-ubuntu-16.04.1_2019-03-27_2.4', - csit_centos_ver=u'csit-centos-7.6-1810_2019-05-20_2.5', + prev_release=u'rls1908', + srelease=u'2001', + csitrelease=u'2001', + csit_prev_release=u'1908', + vpprelease=u'20.01', + vpp_prev_release=u'19.08', + dpdkrelease=u'19.08', + sdpdkrelease=u'1908', + trex_version=u'v2.73', vpp_release_commit_id=u'1c586de48cc76fc6eac50f5d87003e2a80aa43e7') # The language for content autogenerated by Sphinx. Refer to documentation @@ -167,7 +157,7 @@ html_theme_options = { # Add any paths that contain custom static files (such as style sheets) here, # relative to this directory. They are copied after the builtin static files, # so a file named "default.css" will overwrite the builtin "default.css". -html_theme_path = [u'env/lib/python2.7/site-packages/sphinx_rtd_theme'] +html_theme_path = [u'env/lib/python3.6/site-packages/sphinx_rtd_theme'] # html_static_path = ['_build/_static'] html_static_path = [u'_tmp/src/_static'] diff --git a/resources/tools/presentation/conf_cpta/conf.py b/resources/tools/presentation/conf_cpta/conf.py index 97b39c2221..50531d94da 100644 --- a/resources/tools/presentation/conf_cpta/conf.py +++ b/resources/tools/presentation/conf_cpta/conf.py @@ -91,7 +91,7 @@ html_theme = u'sphinx_rtd_theme' # Add any paths that contain custom static files (such as style sheets) here, # relative to this directory. They are copied after the builtin static files, # so a file named "default.css" will overwrite the builtin "default.css". -html_theme_path = [u'env/lib/python2.7/site-packages/sphinx_rtd_theme'] +html_theme_path = [u'env/lib/python3.6/site-packages/sphinx_rtd_theme'] # html_static_path = ['_build/_static'] html_static_path = [u'../_tmp/src/_static'] diff --git a/resources/tools/presentation/run_report.sh b/resources/tools/presentation/run_report.sh index 9f6290e4b2..f2a36b2cbb 100755 --- a/resources/tools/presentation/run_report.sh +++ b/resources/tools/presentation/run_report.sh @@ -38,7 +38,7 @@ export PYTHONPATH=`pwd`:`pwd`/../../../:`pwd`/../../libraries/python python pal.py \ --specification specification.yaml \ --release ${RELEASE} \ - --week "38" \ + --week "05" \ --logging INFO \ --force -- 2.16.6