hs-test: support for multiple workers

[vpp.git] / extras / hs-test / Makefile

diff --git a/extras/hs-test/Makefile b/extras/hs-test/Makefile
index 29cbd0e..3d7673a 100644 (file)
--- a/extras/hs-test/Makefile
+++ b/extras/hs-test/Makefile
@@ -19,6 +19,18 @@ ifeq ($(DEBUG),)
 DEBUG=false
 endif
 
+ifeq ($(CPUS),)
+CPUS=1
+endif
+
+ifeq ($(UBUNTU_CODENAME),)
+UBUNTU_CODENAME=$(shell grep '^UBUNTU_CODENAME=' /etc/os-release | cut -f2- -d=)
+endif
+
+ifeq ($(ARCH),)
+ARCH=$(shell dpkg --print-architecture)
+endif
+
 list_tests = @(grep -r ') Test' *_test.go | cut -d '*' -f2 | cut -d '(' -f1 | \
                tr -d ' ' | tr ')' '/' | sed 's/Suite//')
 
@@ -39,6 +51,7 @@ help:
        @echo " UNCONFIGURE=[true|false] - unconfigure selected test"
        @echo " DEBUG=[true|false]       - attach VPP to GDB"
        @echo " TEST=[test-name]         - specific test to run"
+       @echo " CPUS=[n-cpus]            - number of cpus to run with vpp"
        @echo
        @echo "List of all tests:"
        $(call list_tests)
@@ -56,29 +69,40 @@ build-vpp-debug:
 .PHONY: test
 test: .deps.ok .build.vpp
        @bash ./test --persist=$(PERSIST) --verbose=$(VERBOSE) \
-               --unconfigure=$(UNCONFIGURE) --debug=$(DEBUG) --test=$(TEST)
+               --unconfigure=$(UNCONFIGURE) --debug=$(DEBUG) --test=$(TEST) --cpus=$(CPUS)
 
 build-go:
        go build ./tools/http_server
 
 build: .deps.ok build-vpp-release build-go
-       @rm .build.vpp || exit 0
+       @rm -f .build.vpp
        bash ./script/build.sh release
        @touch .build.vpp
 
 build-debug: .deps.ok build-vpp-debug build-go
-       @rm .build.vpp || exit 0
+       @rm -f .build.vpp
        bash ./script/build.sh debug
        @touch .build.vpp
 
+.deps.ok:
+       @sudo make install-deps
+
 .PHONY: install-deps
 install-deps:
-       @rm .deps.ok || exit 0
-       @apt update -y && apt install -y golang docker-ce apache2-utils wrk bridge-utils
+       @rm -f .deps.ok
+       @apt-get update \
+               && apt-get install -y apt-transport-https ca-certificates curl software-properties-common \
+               && apt-get install -y golang apache2-utils wrk bridge-utils
+       @if [ ! -f /usr/share/keyrings/docker-archive-keyring.gpg ] ; then \
+               curl -fsSL https://download.docker.com/linux/ubuntu/gpg | sudo gpg --dearmor -o /usr/share/keyrings/docker-archive-keyring.gpg; \
+               echo "deb [arch=$(ARCH) signed-by=/usr/share/keyrings/docker-archive-keyring.gpg] https://download.docker.com/linux/ubuntu $(UBUNTU_CODENAME) stable" \
+                       | sudo tee /etc/apt/sources.list.d/docker.list > /dev/null ; \
+               apt-get update; \
+       fi
+       @apt-get install -y docker-ce
        @touch .deps.ok
 
 .PHONY: fixstyle
 fixstyle:
        @gofmt -w .
        @go mod tidy
-