From 28253d97157cec75dba7b74cb2574ce11e8937f6 Mon Sep 17 00:00:00 2001 From: Florin Coras Date: Fri, 1 Aug 2025 19:06:04 -0400 Subject: [PATCH] hs-test: glean proxy environment variables is present Type: test Change-Id: I2dc9136b12444f0fd2ef725b2d778a54538e5b17 Signed-off-by: Florin Coras --- extras/hs-test/Makefile | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/extras/hs-test/Makefile b/extras/hs-test/Makefile index 4d33529959f..b264795d232 100644 --- a/extras/hs-test/Makefile +++ b/extras/hs-test/Makefile @@ -93,6 +93,7 @@ DOCKER_DEVICES:=--device /dev/vhost-net:/dev/vhost-net --device /dev/net/tun:/de DOCKER_VOLUMES:=-v $(WS_ROOT):$(WS_ROOT) -v /var/run/docker.sock:/var/run/docker.sock -v /tmp/hs-test:/tmp/hs-test \ -v /etc/localtime:/etc/localtime:ro $(CORE_VOLUME) -v $(HS_ROOT)/.go_cache/mod:/root/go/pkg/mod \ -v $(HS_ROOT)/.go_cache/build:/root/.cache/go-build +DOCKER_PROXY:=-e HTTP_PROXY=$(HTTP_PROXY) -e HTTPS_PROXY=$(HTTPS_PROXY) -e NO_PROXY=$(NO_PROXY) .PHONY: help help: @@ -177,7 +178,7 @@ build-vpp-gcov: build-msg .PHONY: test test: FORCE_BUILD=false test: .deps.ok .build.ok - docker run $(DOCKER_TTY) --rm $(DOCKER_CAPABILITIES) $(DOCKER_DEVICES) \ + docker run $(DOCKER_TTY) --rm $(DOCKER_CAPABILITIES) $(DOCKER_DEVICES) $(DOCKER_PROXY)\ -e BUILD_NUMBER=$(BUILD_NUMBER) $(DOCKER_VOLUMES) --name ginkgo hs-test/ginkgo \ .$(HS_ROOT)/hs_test.sh --persist=$(PERSIST) --verbose=$(VERBOSE) \ --unconfigure=$(UNCONFIGURE) --debug=$(DEBUG) --test=$(TEST) --cpus=$(CPUS) \ @@ -189,7 +190,7 @@ test: .deps.ok .build.ok .PHONY: test-debug test-debug: FORCE_BUILD=false test-debug: .deps.ok .build_debug.ok - docker run $(DOCKER_TTY) --rm $(DOCKER_CAPABILITIES) $(DOCKER_DEVICES) \ + docker run $(DOCKER_TTY) --rm $(DOCKER_CAPABILITIES) $(DOCKER_DEVICES) $(DOCKER_PROXY)\ -e BUILD_NUMBER=$(BUILD_NUMBER) $(DOCKER_VOLUMES) --name ginkgo hs-test/ginkgo \ .$(HS_ROOT)/hs_test.sh --persist=$(PERSIST) --verbose=$(VERBOSE) \ --unconfigure=$(UNCONFIGURE) --debug=$(DEBUG) --test=$(TEST) --cpus=$(CPUS) \ @@ -205,7 +206,7 @@ wipe-lcov: .PHONY: test-cov test-cov: FORCE_BUILD=false test-cov: .deps.ok .build.cov.ok wipe-lcov - -docker run $(DOCKER_TTY) --rm $(DOCKER_CAPABILITIES) $(DOCKER_DEVICES) \ + -docker run $(DOCKER_TTY) --rm $(DOCKER_CAPABILITIES) $(DOCKER_DEVICES) $(DOCKER_PROXY)\ -e BUILD_NUMBER=$(BUILD_NUMBER) $(DOCKER_VOLUMES) --name ginkgo hs-test/ginkgo \ .$(HS_ROOT)/hs_test.sh --coverage=true --persist=$(PERSIST) --verbose=$(VERBOSE) \ --unconfigure=$(UNCONFIGURE) --debug=$(DEBUG) --test=$(TEST-HS) --cpus=$(CPUS) \ @@ -217,7 +218,7 @@ test-cov: .deps.ok .build.cov.ok wipe-lcov .PHONY: test-leak test-leak: FORCE_BUILD=false test-leak: .deps.ok .build_debug.ok - docker run $(DOCKER_TTY) --rm $(DOCKER_CAPABILITIES) $(DOCKER_DEVICES) \ + docker run $(DOCKER_TTY) --rm $(DOCKER_CAPABILITIES) $(DOCKER_DEVICES) $(DOCKER_PROXY)\ -e BUILD_NUMBER=$(BUILD_NUMBER) $(DOCKER_VOLUMES) --name ginkgo hs-test/ginkgo \ .$(HS_ROOT)/hs_test.sh --test=$(TEST) --debug_build=true --leak_check=true --vppsrc=$(VPPSRC) --timeout=$(TIMEOUT) \ --ginkgo_timeout=$(GINKGO_TIMEOUT) --vpp_cpus=$(VPP_CPUS) --hs_root=$(HS_ROOT); -- 2.16.6