From: Adrian Villin <avillin@cisco.com>
Date: Mon, 3 Jun 2024 08:58:58 +0000 (-0400)
Subject: hs-test: add libunwind dependency to nginx dockerfile
X-Git-Tag: v25.02-rc0~221
X-Git-Url: https://gerrit.fd.io/r/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F61%2F40961%2F1;p=vpp.git

hs-test: add libunwind dependency to nginx dockerfile

- Libunwind was missing in Dockerfile.nginx, causing some tests to fail.
  Tests that were temporarily disabled because of that issue
  are now re-enabled.

Type: test

Change-Id: I3f544be483784e8a7a1f22737cafca615b9f836b
Signed-off-by: Adrian Villin <avillin@cisco.com>
---

diff --git a/extras/hs-test/docker/Dockerfile.nginx b/extras/hs-test/docker/Dockerfile.nginx
index 11ec6af156d..386f8e90016 100644
--- a/extras/hs-test/docker/Dockerfile.nginx
+++ b/extras/hs-test/docker/Dockerfile.nginx
@@ -3,7 +3,7 @@ ARG UBUNTU_VERSION
 FROM ubuntu:${UBUNTU_VERSION}
 
 RUN apt-get update \
- && apt-get install -y nginx gdb less \
+ && apt-get install -y nginx gdb less libunwind-dev \
  && rm -rf /var/lib/apt/lists/*
 
 COPY vpp-data/lib/* /usr/lib/
diff --git a/extras/hs-test/http_test.go b/extras/hs-test/http_test.go
index 0bb6a43e851..4f7ed939d11 100644
--- a/extras/hs-test/http_test.go
+++ b/extras/hs-test/http_test.go
@@ -204,7 +204,6 @@ func HeaderServerTest(s *NoTopoSuite) {
 }
 
 func NginxAsServerTest(s *NoTopoSuite) {
-	s.skip("Broken in the CI")
 	query := "return_ok"
 	finished := make(chan error, 1)
 
@@ -279,17 +278,14 @@ func runNginxPerf(s *NoTopoSuite, mode, ab_or_wrk string) error {
 
 // unstable with multiple workers
 func NginxPerfCpsTest(s *NoTopoSuite) {
-	s.skip("Broken in the CI")
 	s.SkipIfMultiWorker()
 	s.assertNil(runNginxPerf(s, "cps", "ab"))
 }
 
 func NginxPerfRpsTest(s *NoTopoSuite) {
-	s.skip("Broken in the CI")
 	s.assertNil(runNginxPerf(s, "rps", "ab"))
 }
 
 func NginxPerfWrkTest(s *NoTopoSuite) {
-	s.skip("Broken in the CI")
 	s.assertNil(runNginxPerf(s, "", "wrk"))
 }
diff --git a/extras/hs-test/mirroring_test.go b/extras/hs-test/mirroring_test.go
index daf3fc913e0..1fd15dde2f4 100644
--- a/extras/hs-test/mirroring_test.go
+++ b/extras/hs-test/mirroring_test.go
@@ -5,12 +5,11 @@ import (
 )
 
 func init() {
-	// registerNginxTests(MirroringTest)
+	registerNginxTests(MirroringTest)
 }
 
 // broken when CPUS > 1
 func MirroringTest(s *NginxSuite) {
-	s.skip("Broken in the CI")
 	s.SkipIfMultiWorker()
 	proxyAddress := s.getInterfaceByName(mirroringClientInterfaceName).peer.ip4AddressString()