From ee3f13361fbf967f59fc0253430cadc7c6e56084 Mon Sep 17 00:00:00 2001
From: Viliam Luc <vluc@cisco.com>
Date: Tue, 29 Nov 2022 14:09:46 +0100
Subject: [PATCH] nginx: bump down to working 1_21_5 version

Signed-off-by: Viliam Luc <vluc@cisco.com>
Change-Id: I9ff7abda9961d92c98ab08c77e79406644c115fc
---
 docs/job_specs/report_iterative/2n-clx/vsap-00.md  | 36 +++++++++++-----------
 ...th-ip4tcphttp-ldpreload-nginx-1_21_5-cps.robot} | 20 ++++++------
 ...th-ip4tcphttp-ldpreload-nginx-1_21_5-rps.robot} | 20 ++++++------
 3 files changed, 38 insertions(+), 38 deletions(-)
 rename tests/vpp/perf/hoststack/{2n1l-10ge2p1x710-eth-ip4tcphttp-ldpreload-nginx-1_22_1-cps.robot => 2n1l-10ge2p1x710-eth-ip4tcphttp-ldpreload-nginx-1_21_5-cps.robot} (87%)
 rename tests/vpp/perf/hoststack/{2n1l-10ge2p1x710-eth-ip4tcphttp-ldpreload-nginx-1_22_1-rps.robot => 2n1l-10ge2p1x710-eth-ip4tcphttp-ldpreload-nginx-1_21_5-rps.robot} (87%)

diff --git a/docs/job_specs/report_iterative/2n-clx/vsap-00.md b/docs/job_specs/report_iterative/2n-clx/vsap-00.md
index 0cf0b8a747..17832fe2ad 100644
--- a/docs/job_specs/report_iterative/2n-clx/vsap-00.md
+++ b/docs/job_specs/report_iterative/2n-clx/vsap-00.md
@@ -16,24 +16,24 @@
 ## ./hoststack
 ### mellanox-cx556a
 #### dpdk-vfio-pci
-##### eth-ip4tcphttp-ldpreload-nginx-1_22_1
-1c AND 0b AND cps AND cx556a AND drv_rdma_core AND eth-ip4tcphttp-ldpreload-nginx-1_22_1
-1c AND 64b AND cps AND cx556a AND drv_rdma_core AND eth-ip4tcphttp-ldpreload-nginx-1_22_1
-1c AND 1024b AND cps AND cx556a AND drv_rdma_core AND eth-ip4tcphttp-ldpreload-nginx-1_22_1
-1c AND 2048b AND cps AND cx556a AND drv_rdma_core AND eth-ip4tcphttp-ldpreload-nginx-1_22_1
-1c AND 0b AND rps AND cx556a AND drv_rdma_core AND eth-ip4tcphttp-ldpreload-nginx-1_22_1
-1c AND 64b AND rps AND cx556a AND drv_rdma_core AND eth-ip4tcphttp-ldpreload-nginx-1_22_1
-1c AND 1024b AND rps AND cx556a AND drv_rdma_core AND eth-ip4tcphttp-ldpreload-nginx-1_22_1
-1c AND 2048b AND rps AND cx556a AND drv_rdma_core AND eth-ip4tcphttp-ldpreload-nginx-1_22_1
+##### eth-ip4tcphttp-ldpreload-nginx-1_21_5
+1c AND 0b AND cps AND cx556a AND drv_rdma_core AND eth-ip4tcphttp-ldpreload-nginx-1_21_5
+1c AND 64b AND cps AND cx556a AND drv_rdma_core AND eth-ip4tcphttp-ldpreload-nginx-1_21_5
+1c AND 1024b AND cps AND cx556a AND drv_rdma_core AND eth-ip4tcphttp-ldpreload-nginx-1_21_5
+1c AND 2048b AND cps AND cx556a AND drv_rdma_core AND eth-ip4tcphttp-ldpreload-nginx-1_21_5
+1c AND 0b AND rps AND cx556a AND drv_rdma_core AND eth-ip4tcphttp-ldpreload-nginx-1_21_5
+1c AND 64b AND rps AND cx556a AND drv_rdma_core AND eth-ip4tcphttp-ldpreload-nginx-1_21_5
+1c AND 1024b AND rps AND cx556a AND drv_rdma_core AND eth-ip4tcphttp-ldpreload-nginx-1_21_5
+1c AND 2048b AND rps AND cx556a AND drv_rdma_core AND eth-ip4tcphttp-ldpreload-nginx-1_21_5
 ### intel-e810cq
 #### dpdk-vfio-pci
-##### eth-ip4tcphttp-ldpreload-nginx-1_22_1
-1c AND 0b AND cps AND e810cq AND drv_vfio_pci AND eth-ip4tcphttp-ldpreload-nginx-1_22_1
-1c AND 64b AND cps AND e810cq AND drv_vfio_pci AND eth-ip4tcphttp-ldpreload-nginx-1_22_1
-1c AND 1024b AND cps AND e810cq AND drv_vfio_pci AND eth-ip4tcphttp-ldpreload-nginx-1_22_1
-1c AND 2048b AND cps AND e810cq AND drv_vfio_pci AND eth-ip4tcphttp-ldpreload-nginx-1_22_1
-1c AND 0b AND rps AND e810cq AND drv_vfio_pci AND eth-ip4tcphttp-ldpreload-nginx-1_22_1
-1c AND 64b AND rps AND e810cq AND drv_vfio_pci AND eth-ip4tcphttp-ldpreload-nginx-1_22_1
-1c AND 1024b AND rps AND e810cq AND drv_vfio_pci AND eth-ip4tcphttp-ldpreload-nginx-1_22_1
-1c AND 2048b AND rps AND e810cq AND drv_vfio_pci AND eth-ip4tcphttp-ldpreload-nginx-1_22_1
+##### eth-ip4tcphttp-ldpreload-nginx-1_21_5
+1c AND 0b AND cps AND e810cq AND drv_vfio_pci AND eth-ip4tcphttp-ldpreload-nginx-1_21_5
+1c AND 64b AND cps AND e810cq AND drv_vfio_pci AND eth-ip4tcphttp-ldpreload-nginx-1_21_5
+1c AND 1024b AND cps AND e810cq AND drv_vfio_pci AND eth-ip4tcphttp-ldpreload-nginx-1_21_5
+1c AND 2048b AND cps AND e810cq AND drv_vfio_pci AND eth-ip4tcphttp-ldpreload-nginx-1_21_5
+1c AND 0b AND rps AND e810cq AND drv_vfio_pci AND eth-ip4tcphttp-ldpreload-nginx-1_21_5
+1c AND 64b AND rps AND e810cq AND drv_vfio_pci AND eth-ip4tcphttp-ldpreload-nginx-1_21_5
+1c AND 1024b AND rps AND e810cq AND drv_vfio_pci AND eth-ip4tcphttp-ldpreload-nginx-1_21_5
+1c AND 2048b AND rps AND e810cq AND drv_vfio_pci AND eth-ip4tcphttp-ldpreload-nginx-1_21_5
 ## ./vm_vhost
diff --git a/tests/vpp/perf/hoststack/2n1l-10ge2p1x710-eth-ip4tcphttp-ldpreload-nginx-1_22_1-cps.robot b/tests/vpp/perf/hoststack/2n1l-10ge2p1x710-eth-ip4tcphttp-ldpreload-nginx-1_21_5-cps.robot
similarity index 87%
rename from tests/vpp/perf/hoststack/2n1l-10ge2p1x710-eth-ip4tcphttp-ldpreload-nginx-1_22_1-cps.robot
rename to tests/vpp/perf/hoststack/2n1l-10ge2p1x710-eth-ip4tcphttp-ldpreload-nginx-1_21_5-cps.robot
index e4e02cd8dd..8dbd525e52 100644
--- a/tests/vpp/perf/hoststack/2n1l-10ge2p1x710-eth-ip4tcphttp-ldpreload-nginx-1_22_1-cps.robot
+++ b/tests/vpp/perf/hoststack/2n1l-10ge2p1x710-eth-ip4tcphttp-ldpreload-nginx-1_21_5-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_22_1
+| ... | TCP_CPS | eth-ip4tcphttp-ldpreload-nginx-1_21_5
 |
 | 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.22.1
+| ${nginx_version}= | 1.21.5
 
 *** Keywords ***
 | Local template
@@ -90,34 +90,34 @@
 | | ... | ${ciphers} | ${frame_size} | ${tls_tcp} | ${rps_cps}
 
 *** Test Cases ***
-| 0B-1c-eth-ip4tcphttp-ldpreload-nginx-1_22_1-cps
+| 0B-1c-eth-ip4tcphttp-ldpreload-nginx-1_21_5-cps
 | | [Tags] | 0B | 1C
 | | frame_size=${0} | phy_cores=${1}
 
-| 0B-2c-eth-ip4tcphttp-ldpreload-nginx-1_22_1-cps
+| 0B-2c-eth-ip4tcphttp-ldpreload-nginx-1_21_5-cps
 | | [Tags] | 0B | 2C
 | | frame_size=${0} | phy_cores=${2}
 
-| 64B-1c-eth-ip4tcphttp-ldpreload-nginx-1_22_1-cps
+| 64B-1c-eth-ip4tcphttp-ldpreload-nginx-1_21_5-cps
 | | [Tags] | 64B | 1C
 | | frame_size=${64} | phy_cores=${1}
 
-| 64B-2c-eth-ip4tcphttp-ldpreload-nginx-1_22_1-cps
+| 64B-2c-eth-ip4tcphttp-ldpreload-nginx-1_21_5-cps
 | | [Tags] | 64B | 2C
 | | frame_size=${64} | phy_cores=${2}
 
-| 1024B-1c-eth-ip4tcphttp-ldpreload-nginx-1_22_1-cps
+| 1024B-1c-eth-ip4tcphttp-ldpreload-nginx-1_21_5-cps
 | | [Tags] | 1024B | 1C
 | | frame_size=${1024} | phy_cores=${1}
 
-| 1024B-2c-eth-ip4tcphttp-ldpreload-nginx-1_22_1-cps
+| 1024B-2c-eth-ip4tcphttp-ldpreload-nginx-1_21_5-cps
 | | [Tags] | 1024B | 2C
 | | frame_size=${1024} | phy_cores=${2}
 
-| 2048B-1c-eth-ip4tcphttp-ldpreload-nginx-1_22_1-cps
+| 2048B-1c-eth-ip4tcphttp-ldpreload-nginx-1_21_5-cps
 | | [Tags] | 2048B | 1C
 | | frame_size=${2048} | phy_cores=${1}
 
-| 2048B-2c-eth-ip4tcphttp-ldpreload-nginx-1_22_1-cps
+| 2048B-2c-eth-ip4tcphttp-ldpreload-nginx-1_21_5-cps
 | | [Tags] | 2048B | 2C
 | | frame_size=${2048} | phy_cores=${2}
diff --git a/tests/vpp/perf/hoststack/2n1l-10ge2p1x710-eth-ip4tcphttp-ldpreload-nginx-1_22_1-rps.robot b/tests/vpp/perf/hoststack/2n1l-10ge2p1x710-eth-ip4tcphttp-ldpreload-nginx-1_21_5-rps.robot
similarity index 87%
rename from tests/vpp/perf/hoststack/2n1l-10ge2p1x710-eth-ip4tcphttp-ldpreload-nginx-1_22_1-rps.robot
rename to tests/vpp/perf/hoststack/2n1l-10ge2p1x710-eth-ip4tcphttp-ldpreload-nginx-1_21_5-rps.robot
index 4e7afe9fdc..0f3af4d0c3 100644
--- a/tests/vpp/perf/hoststack/2n1l-10ge2p1x710-eth-ip4tcphttp-ldpreload-nginx-1_22_1-rps.robot
+++ b/tests/vpp/perf/hoststack/2n1l-10ge2p1x710-eth-ip4tcphttp-ldpreload-nginx-1_21_5-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_22_1
+| ... | TCP_RPS | eth-ip4tcphttp-ldpreload-nginx-1_21_5
 |
 | 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.22.1
+| ${nginx_version}= | 1.21.5
 
 *** Keywords ***
 | Local template
@@ -90,34 +90,34 @@
 | | ... | ${ciphers} | ${frame_size} | ${tls_tcp} | ${rps_cps}
 
 *** Test Cases ***
-| 0B-1c-eth-ip4tcphttp-ldpreload-nginx-1_22_1-rps
+| 0B-1c-eth-ip4tcphttp-ldpreload-nginx-1_21_5-rps
 | | [Tags] | 0B | 1C
 | | frame_size=${0} | phy_cores=${1}
 
-| 0B-2c-eth-ip4tcphttp-ldpreload-nginx-1_22_1-rps
+| 0B-2c-eth-ip4tcphttp-ldpreload-nginx-1_21_5-rps
 | | [Tags] | 0B | 2C
 | | frame_size=${0} | phy_cores=${2}
 
-| 64B-1c-eth-ip4tcphttp-ldpreload-nginx-1_22_1-rps
+| 64B-1c-eth-ip4tcphttp-ldpreload-nginx-1_21_5-rps
 | | [Tags] | 64B | 1C
 | | frame_size=${64} | phy_cores=${1}
 
-| 64B-2c-eth-ip4tcphttp-ldpreload-nginx-1_22_1-rps
+| 64B-2c-eth-ip4tcphttp-ldpreload-nginx-1_21_5-rps
 | | [Tags] | 64B | 2C
 | | frame_size=${64} | phy_cores=${2}
 
-| 1024B-1c-eth-ip4tcphttp-ldpreload-nginx-1_22_1-rps
+| 1024B-1c-eth-ip4tcphttp-ldpreload-nginx-1_21_5-rps
 | | [Tags] | 1024B | 1C
 | | frame_size=${1024} | phy_cores=${1}
 
-| 1024B-2c-eth-ip4tcphttp-ldpreload-nginx-1_22_1-rps
+| 1024B-2c-eth-ip4tcphttp-ldpreload-nginx-1_21_5-rps
 | | [Tags] | 1024B | 2C
 | | frame_size=${1024} | phy_cores=${2}
 
-| 2048B-1c-eth-ip4tcphttp-ldpreload-nginx-1_22_1-rps
+| 2048B-1c-eth-ip4tcphttp-ldpreload-nginx-1_21_5-rps
 | | [Tags] | 2048B | 1C
 | | frame_size=${2048} | phy_cores=${1}
 
-| 2048B-2c-eth-ip4tcphttp-ldpreload-nginx-1_22_1-rps
+| 2048B-2c-eth-ip4tcphttp-ldpreload-nginx-1_21_5-rps
 | | [Tags] | 2048B | 2C
 | | frame_size=${2048} | phy_cores=${2}
-- 
2.16.6