Remove unused variables and verbose e2e logs
This commit is contained in:
parent
47b5e20a88
commit
10dcf0db15
35 changed files with 331 additions and 427 deletions
|
|
@ -1,24 +1,8 @@
|
|||
.PHONY: all
|
||||
all: image
|
||||
|
||||
DIR:=$(shell dirname $(realpath $(firstword $(MAKEFILE_LIST))))
|
||||
|
||||
# Use docker to run makefile tasks
|
||||
USE_DOCKER ?= true
|
||||
|
||||
# Disable run docker tasks if running in prow.
|
||||
# only checks the existence of the variable, not the value.
|
||||
ifdef DIND_TASKS
|
||||
USE_DOCKER=false
|
||||
endif
|
||||
|
||||
.PHONY: image
|
||||
image:
|
||||
ifeq ($(USE_DOCKER), true)
|
||||
@$(DIR)/../../build/run-in-docker.sh make e2e-test-binary
|
||||
else
|
||||
@make -C $(DIR)/../../ e2e-test-binary
|
||||
endif
|
||||
make -C $(DIR)/../../ e2e-test-binary
|
||||
|
||||
cp $(DIR)/../e2e/e2e.test .
|
||||
cp $(DIR)/../e2e/wait-for-nginx.sh .
|
||||
|
|
@ -30,7 +14,9 @@ endif
|
|||
docker build \
|
||||
--tag nginx-ingress-controller:e2e .
|
||||
|
||||
.PHONY: clean
|
||||
clean:
|
||||
rm -rf _cache e2e.test kubectl cluster ginkgo
|
||||
docker rmi -f nginx-ingress-controller:e2e || true
|
||||
|
||||
|
||||
.PHONY: image clean
|
||||
Loading…
Add table
Add a link
Reference in a new issue