nginx: new stable 1.22.1 version

- removed old 1_15_0
- removed old 1_14_2
+ updated job_specs

Signed-off-by: Viliam Luc <vluc@cisco.com>
Change-Id: Ie75cde28f485b809fe08f808f4fa7d31d52c3929

4 files changed, 20 insertions, 266 deletions

diff --git a/tests/vpp/perf/hoststack/2n1l-10ge2p1x710-eth-ip4tcphttp-ldpreload-nginx-1_15_0-cps.robot b/tests/vpp/perf/hoststack/2n1l-10ge2p1x710-eth-ip4tcphttp-ldpreload-nginx-1_15_0-cps.robot
deleted file mode 100644
index faee23794d..0000000000
--- a/tests/vpp/perf/hoststack/2n1l-10ge2p1x710-eth-ip4tcphttp-ldpreload-nginx-1_15_0-cps.robot
+++ /dev/null
@@ -1,123 +0,0 @@
-# Copyright (c) 2022 Intel and/or its affiliates.
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at:
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-*** Settings ***
-| Resource | resources/libraries/robot/shared/default.robot
-| Resource | resources/libraries/robot/hoststack/hoststack.robot
-|
-| Force Tags | 2_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV
-| ... | HOSTSTACK | LDP_NGINX | TCP | NIC_Intel-X710 | DRV_VFIO_PCI
-| ... | TCP_CPS | eth-ip4tcphttp-ldpreload-nginx-1_15_0
-|
-| Suite Setup | Setup suite topology interfaces | ab | nginx
-| Suite Teardown | Tear down suite | ab
-| Test Setup | Setup test
-| Test Teardown | Tear down test | nginx
-|
-| Test Template | Local Template
-|
-| Documentation | **TCP requests per seconds.**
-| ... |
-| ... | - **[Top] Network Topologies:** TG-DUT-TG 2-node topology \
-| ... | with single link between nodes.
-| ... |
-| ... | - **[Enc] Packet Encapsulations:** Eth-IPv4-TCP-HTTP for TCP
-| ... |
-| ... | - **[Cfg] DUT configuration:**
-| ... |
-| ... | - **[Ver] TG verification:**
-| ... |
-| ... | - **[Ref] Applicable standard specifications:**
-
-*** Variables ***
-| @{plugins_to_enable}= | dpdk_plugin.so | perfmon_plugin.so
-| ${nic_name}= | Intel-X710
-| ${crypto_type}= | ${None}
-| ${nic_driver}= | vfio-pci
-| ${nic_rxq_size}= | 0
-| ${nic_txq_size}= | 0
-| ${nic_pfs}= | 2
-| ${nic_vfs}= | 0
-| ${overhead}= | ${0}
-| ${ciphers}= | 0
-| ${rps_cps}= | cps
-| ${qat}= | ${0}
-| ${r_total}= | ${1000000}
-| ${c_total}= | ${2000}
-| ${listen_port}= | ${80}
-| ${mode}= | ldp
-| ${tls_tcp}= | tcp
-| ${keep_time}= | 0
-| ${ab_ip_prefix}= | 24
-| @{ab_ip_addrs}= | 192.168.10.2
-| ${dut_ip_prefix}= | 24
-| @{dut_ip_addrs}= | 192.168.10.1
-| ${nginx_version}= | 1.15.0
-
-*** Keywords ***
-| Local template
-| | [Arguments] | ${frame_size} | ${phy_cores} | ${rxq}=${None}
-| |
-| | Set Test Variable | \${frame_size}
-| | Set Test Variable | ${dpdk_no_tx_checksum_offload} | ${False}
-| | Given Set Max Rate And Jumbo
-| | And Add worker threads to all DUTs | ${phy_cores} | ${rxq}
-| | And Pre-initialize layer driver | ${nic_driver}
-| | FOR | ${dut} | IN | @{duts}
-| | | Import Library | resources.libraries.python.VppConfigGenerator
-| | | ... | WITH NAME | ${dut}
-| | | Run keyword | ${dut}.Add Session Event Queues Memfd Segment
-| | | Run keyword | ${dut}.Add tcp congestion control algorithm
-| | | Run keyword | ${dut}.Add session enable
-| | END
-| | And Apply startup configuration on all VPP DUTs
-| | When Initialize layer driver | ${nic_driver}
-| | And Initialize layer interface
-| | And Set up LDP or VCL Nginx on DUT node | ${dut1} | ${mode}
-| | ... | ${rps_cps} | ${phy_cores} | ${qat} | ${tls_tcp}
-| | And Additional Suite Setup Action For ab
-| | Then Measure TLS requests or connections per second
-| | ... | ${ciphers} | ${frame_size} | ${tls_tcp} | ${rps_cps}
-
-*** Test Cases ***
-| 0B-1c-eth-ip4tcphttp-ldpreload-nginx-1_15_0-cps
-| | [Tags] | 0B | 1C
-| | frame_size=${0} | phy_cores=${1}
-
-| 0B-2c-eth-ip4tcphttp-ldpreload-nginx-1_15_0-cps
-| | [Tags] | 0B | 2C
-| | frame_size=${0} | phy_cores=${2}
-
-| 64B-1c-eth-ip4tcphttp-ldpreload-nginx-1_15_0-cps
-| | [Tags] | 64B | 1C
-| | frame_size=${64} | phy_cores=${1}
-
-| 64B-2c-eth-ip4tcphttp-ldpreload-nginx-1_15_0-cps
-| | [Tags] | 64B | 2C
-| | frame_size=${64} | phy_cores=${2}
-
-| 1024B-1c-eth-ip4tcphttp-ldpreload-nginx-1_15_0-cps
-| | [Tags] | 1024B | 1C
-| | frame_size=${1024} | phy_cores=${1}
-
-| 1024B-2c-eth-ip4tcphttp-ldpreload-nginx-1_15_0-cps
-| | [Tags] | 1024B | 2C
-| | frame_size=${1024} | phy_cores=${2}
-
-| 2048B-1c-eth-ip4tcphttp-ldpreload-nginx-1_15_0-cps
-| | [Tags] | 2048B | 1C
-| | frame_size=${2048} | phy_cores=${1}
-
-| 2048B-2c-eth-ip4tcphttp-ldpreload-nginx-1_15_0-cps
-| | [Tags] | 2048B | 2C
-| | frame_size=${2048} | phy_cores=${2}
diff --git a/tests/vpp/perf/hoststack/2n1l-10ge2p1x710-eth-ip4tcphttp-ldpreload-nginx-1_15_0-rps.robot b/tests/vpp/perf/hoststack/2n1l-10ge2p1x710-eth-ip4tcphttp-ldpreload-nginx-1_15_0-rps.robot
deleted file mode 100644
index 4ea86b3b2f..0000000000
--- a/tests/vpp/perf/hoststack/2n1l-10ge2p1x710-eth-ip4tcphttp-ldpreload-nginx-1_15_0-rps.robot
+++ /dev/null
@@ -1,123 +0,0 @@
-# Copyright (c) 2022 Intel and/or its affiliates.
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at:
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-*** Settings ***
-| Resource | resources/libraries/robot/shared/default.robot
-| Resource | resources/libraries/robot/hoststack/hoststack.robot
-|
-| Force Tags | 2_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV
-| ... | HOSTSTACK | LDP_NGINX | TCP | NIC_Intel-X710 | DRV_VFIO_PCI
-| ... | TCP_RPS | eth-ip4tcphttp-ldpreload-nginx-1_15_0
-|
-| Suite Setup | Setup suite topology interfaces | ab | nginx
-| Suite Teardown | Tear down suite | ab
-| Test Setup | Setup test
-| Test Teardown | Tear down test | nginx
-|
-| Test Template | Local Template
-|
-| Documentation | **TCP requests per seconds.**
-| ... |
-| ... | - **[Top] Network Topologies:** TG-DUT-TG 2-node topology \
-| ... | with single link between nodes.
-| ... |
-| ... | - **[Enc] Packet Encapsulations:** Eth-IPv4-TCP-HTTP for TCP
-| ... |
-| ... | - **[Cfg] DUT configuration:**
-| ... |
-| ... | - **[Ver] TG verification:**
-| ... |
-| ... | - **[Ref] Applicable standard specifications:**
-
-*** Variables ***
-| @{plugins_to_enable}= | dpdk_plugin.so | perfmon_plugin.so
-| ${nic_name}= | Intel-X710
-| ${crypto_type}= | ${None}
-| ${nic_driver}= | vfio-pci
-| ${nic_rxq_size}= | 0
-| ${nic_txq_size}= | 0
-| ${nic_pfs}= | 2
-| ${nic_vfs}= | 0
-| ${overhead}= | ${0}
-| ${ciphers}= | 0
-| ${rps_cps}= | rps
-| ${qat}= | ${0}
-| ${r_total}= | ${1000000}
-| ${c_total}= | ${2000}
-| ${listen_port}= | ${80}
-| ${mode}= | ldp
-| ${tls_tcp}= | tcp
-| ${keep_time}= | 300
-| ${ab_ip_prefix}= | 24
-| @{ab_ip_addrs}= | 192.168.10.2
-| ${dut_ip_prefix}= | 24
-| @{dut_ip_addrs}= | 192.168.10.1
-| ${nginx_version}= | 1.15.0
-
-*** Keywords ***
-| Local template
-| | [Arguments] | ${frame_size} | ${phy_cores} | ${rxq}=${None}
-| |
-| | Set Test Variable | \${frame_size}
-| | Set Test Variable | ${dpdk_no_tx_checksum_offload} | ${False}
-| | Given Set Max Rate And Jumbo
-| | And Add worker threads to all DUTs | ${phy_cores} | ${rxq}
-| | And Pre-initialize layer driver | ${nic_driver}
-| | FOR | ${dut} | IN | @{duts}
-| | | Import Library | resources.libraries.python.VppConfigGenerator
-| | | ... | WITH NAME | ${dut}
-| | | Run keyword | ${dut}.Add Session Event Queues Memfd Segment
-| | | Run keyword | ${dut}.Add tcp congestion control algorithm
-| | | Run keyword | ${dut}.Add session enable
-| | END
-| | And Apply startup configuration on all VPP DUTs
-| | When Initialize layer driver | ${nic_driver}
-| | And Initialize layer interface
-| | And Set up LDP or VCL Nginx on DUT node | ${dut1} | ${mode}
-| | ... | ${rps_cps} | ${phy_cores} | ${qat} | ${tls_tcp}
-| | And Additional Suite Setup Action For ab
-| | Then Measure TLS requests or connections per second
-| | ... | ${ciphers} | ${frame_size} | ${tls_tcp} | ${rps_cps}
-
-*** Test Cases ***
-| 0B-1c-eth-ip4tcphttp-ldpreload-nginx-1_15_0-rps
-| | [Tags] | 0B | 1C
-| | frame_size=${0} | phy_cores=${1}
-
-| 0B-2c-eth-ip4tcphttp-ldpreload-nginx-1_15_0-rps
-| | [Tags] | 0B | 2C
-| | frame_size=${0} | phy_cores=${2}
-
-| 64B-1c-eth-ip4tcphttp-ldpreload-nginx-1_15_0-rps
-| | [Tags] | 64B | 1C
-| | frame_size=${64} | phy_cores=${1}
-
-| 64B-2c-eth-ip4tcphttp-ldpreload-nginx-1_15_0-rps
-| | [Tags] | 64B | 2C
-| | frame_size=${64} | phy_cores=${2}
-
-| 1024B-1c-eth-ip4tcphttp-ldpreload-nginx-1_15_0-rps
-| | [Tags] | 1024B | 1C
-| | frame_size=${1024} | phy_cores=${1}
-
-| 1024B-2c-eth-ip4tcphttp-ldpreload-nginx-1_15_0-rps
-| | [Tags] | 1024B | 2C
-| | frame_size=${1024} | phy_cores=${2}
-
-| 2048B-1c-eth-ip4tcphttp-ldpreload-nginx-1_15_0-rps
-| | [Tags] | 2048B | 1C
-| | frame_size=${2048} | phy_cores=${1}
-
-| 2048B-2c-eth-ip4tcphttp-ldpreload-nginx-1_15_0-rps
-| | [Tags] | 2048B | 2C
-| | frame_size=${2048} | phy_cores=${2}
diff --git a/tests/vpp/perf/hoststack/2n1l-10ge2p1x710-eth-ip4tcphttp-ldpreload-nginx-1_14_2-cps.robot b/tests/vpp/perf/hoststack/2n1l-10ge2p1x710-eth-ip4tcphttp-ldpreload-nginx-1_22_1-cps.robot
index 0dcd63f3ed..e4e02cd8dd 100644
--- a/tests/vpp/perf/hoststack/2n1l-10ge2p1x710-eth-ip4tcphttp-ldpreload-nginx-1_14_2-cps.robot
+++ b/tests/vpp/perf/hoststack/2n1l-10ge2p1x710-eth-ip4tcphttp-ldpreload-nginx-1_22_1-cps.robot
@@ -17,7 +17,7 @@
 |
 | Force Tags | 2_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV
 | ... | HOSTSTACK | LDP_NGINX | TCP | NIC_Intel-X710 | DRV_VFIO_PCI
-| ... | TCP_CPS | eth-ip4tcphttp-ldpreload-nginx-1_14_2
+| ... | TCP_CPS | eth-ip4tcphttp-ldpreload-nginx-1_22_1
 |
 | Suite Setup | Setup suite topology interfaces | ab | nginx
 | Suite Teardown | Tear down suite | ab
@@ -62,7 +62,7 @@
 | @{ab_ip_addrs}= | 192.168.10.2
 | ${dut_ip_prefix}= | 24
 | @{dut_ip_addrs}= | 192.168.10.1
-| ${nginx_version}= | 1.14.2
+| ${nginx_version}= | 1.22.1
 
 *** Keywords ***
 | Local template
@@ -90,34 +90,34 @@
 | | ... | ${ciphers} | ${frame_size} | ${tls_tcp} | ${rps_cps}
 
 *** Test Cases ***
-| 0B-1c-eth-ip4tcphttp-ldpreload-nginx-1_14_2-cps
+| 0B-1c-eth-ip4tcphttp-ldpreload-nginx-1_22_1-cps
 | | [Tags] | 0B | 1C
 | | frame_size=${0} | phy_cores=${1}
 
-| 0B-2c-eth-ip4tcphttp-ldpreload-nginx-1_14_2-cps
+| 0B-2c-eth-ip4tcphttp-ldpreload-nginx-1_22_1-cps
 | | [Tags] | 0B | 2C
 | | frame_size=${0} | phy_cores=${2}
 
-| 64B-1c-eth-ip4tcphttp-ldpreload-nginx-1_14_2-cps
+| 64B-1c-eth-ip4tcphttp-ldpreload-nginx-1_22_1-cps
 | | [Tags] | 64B | 1C
 | | frame_size=${64} | phy_cores=${1}
 
-| 64B-2c-eth-ip4tcphttp-ldpreload-nginx-1_14_2-cps
+| 64B-2c-eth-ip4tcphttp-ldpreload-nginx-1_22_1-cps
 | | [Tags] | 64B | 2C
 | | frame_size=${64} | phy_cores=${2}
 
-| 1024B-1c-eth-ip4tcphttp-ldpreload-nginx-1_14_2-cps
+| 1024B-1c-eth-ip4tcphttp-ldpreload-nginx-1_22_1-cps
 | | [Tags] | 1024B | 1C
 | | frame_size=${1024} | phy_cores=${1}
 
-| 1024B-2c-eth-ip4tcphttp-ldpreload-nginx-1_14_2-cps
+| 1024B-2c-eth-ip4tcphttp-ldpreload-nginx-1_22_1-cps
 | | [Tags] | 1024B | 2C
 | | frame_size=${1024} | phy_cores=${2}
 
-| 2048B-1c-eth-ip4tcphttp-ldpreload-nginx-1_14_2-cps
+| 2048B-1c-eth-ip4tcphttp-ldpreload-nginx-1_22_1-cps
 | | [Tags] | 2048B | 1C
 | | frame_size=${2048} | phy_cores=${1}
 
-| 2048B-2c-eth-ip4tcphttp-ldpreload-nginx-1_14_2-cps
+| 2048B-2c-eth-ip4tcphttp-ldpreload-nginx-1_22_1-cps
 | | [Tags] | 2048B | 2C
 | | frame_size=${2048} | phy_cores=${2}
diff --git a/tests/vpp/perf/hoststack/2n1l-10ge2p1x710-eth-ip4tcphttp-ldpreload-nginx-1_14_2-rps.robot b/tests/vpp/perf/hoststack/2n1l-10ge2p1x710-eth-ip4tcphttp-ldpreload-nginx-1_22_1-rps.robot
index 42524f0da4..4e7afe9fdc 100644
--- a/tests/vpp/perf/hoststack/2n1l-10ge2p1x710-eth-ip4tcphttp-ldpreload-nginx-1_14_2-rps.robot
+++ b/tests/vpp/perf/hoststack/2n1l-10ge2p1x710-eth-ip4tcphttp-ldpreload-nginx-1_22_1-rps.robot
@@ -17,7 +17,7 @@
 |
 | Force Tags | 2_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV
 | ... | HOSTSTACK | LDP_NGINX | TCP | NIC_Intel-X710 | DRV_VFIO_PCI
-| ... | TCP_RPS | eth-ip4tcphttp-ldpreload-nginx-1_14_2
+| ... | TCP_RPS | eth-ip4tcphttp-ldpreload-nginx-1_22_1
 |
 | Suite Setup | Setup suite topology interfaces | ab | nginx
 | Suite Teardown | Tear down suite | ab
@@ -62,7 +62,7 @@
 | @{ab_ip_addrs}= | 192.168.10.2
 | ${dut_ip_prefix}= | 24
 | @{dut_ip_addrs}= | 192.168.10.1
-| ${nginx_version}= | 1.14.2
+| ${nginx_version}= | 1.22.1
 
 *** Keywords ***
 | Local template
@@ -90,34 +90,34 @@
 | | ... | ${ciphers} | ${frame_size} | ${tls_tcp} | ${rps_cps}
 
 *** Test Cases ***
-| 0B-1c-eth-ip4tcphttp-ldpreload-nginx-1_14_2-rps
+| 0B-1c-eth-ip4tcphttp-ldpreload-nginx-1_22_1-rps
 | | [Tags] | 0B | 1C
 | | frame_size=${0} | phy_cores=${1}
 
-| 0B-2c-eth-ip4tcphttp-ldpreload-nginx-1_14_2-rps
+| 0B-2c-eth-ip4tcphttp-ldpreload-nginx-1_22_1-rps
 | | [Tags] | 0B | 2C
 | | frame_size=${0} | phy_cores=${2}
 
-| 64B-1c-eth-ip4tcphttp-ldpreload-nginx-1_14_2-rps
+| 64B-1c-eth-ip4tcphttp-ldpreload-nginx-1_22_1-rps
 | | [Tags] | 64B | 1C
 | | frame_size=${64} | phy_cores=${1}
 
-| 64B-2c-eth-ip4tcphttp-ldpreload-nginx-1_14_2-rps
+| 64B-2c-eth-ip4tcphttp-ldpreload-nginx-1_22_1-rps
 | | [Tags] | 64B | 2C
 | | frame_size=${64} | phy_cores=${2}
 
-| 1024B-1c-eth-ip4tcphttp-ldpreload-nginx-1_14_2-rps
+| 1024B-1c-eth-ip4tcphttp-ldpreload-nginx-1_22_1-rps
 | | [Tags] | 1024B | 1C
 | | frame_size=${1024} | phy_cores=${1}
 
-| 1024B-2c-eth-ip4tcphttp-ldpreload-nginx-1_14_2-rps
+| 1024B-2c-eth-ip4tcphttp-ldpreload-nginx-1_22_1-rps
 | | [Tags] | 1024B | 2C
 | | frame_size=${1024} | phy_cores=${2}
 
-| 2048B-1c-eth-ip4tcphttp-ldpreload-nginx-1_14_2-rps
+| 2048B-1c-eth-ip4tcphttp-ldpreload-nginx-1_22_1-rps
 | | [Tags] | 2048B | 1C
 | | frame_size=${2048} | phy_cores=${1}
 
-| 2048B-2c-eth-ip4tcphttp-ldpreload-nginx-1_14_2-rps
+| 2048B-2c-eth-ip4tcphttp-ldpreload-nginx-1_22_1-rps
 | | [Tags] | 2048B | 2C
 | | frame_size=${2048} | phy_cores=${2}