aboutsummaryrefslogtreecommitdiffstats
path: root/extras
diff options
context:
space:
mode:
authorAdrian Villin <avillin@cisco.com>2024-06-03 04:58:58 -0400
committerAdrian Villin <avillin@cisco.com>2024-06-03 04:58:58 -0400
commit05b0307962519bcc61853f3810efddf90cab9217 (patch)
tree3673b92d5524fa51d49362acd76f34ebe493eb05 /extras
parent9d5be6ae2a701838670b606b1fae98646f6dced6 (diff)
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>
Diffstat (limited to 'extras')
-rw-r--r--extras/hs-test/docker/Dockerfile.nginx2
-rw-r--r--extras/hs-test/http_test.go4
-rw-r--r--extras/hs-test/mirroring_test.go3
3 files changed, 2 insertions, 7 deletions
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()