Multiple optimizations to build targets
* Clean up e2e test on interruption * Leverage GOCACHE for faster builds * Forward container STDIN in make targets
This commit is contained in:
parent
e2111013ef
commit
0c7b948317
5 changed files with 16 additions and 4 deletions
6
.gitignore
vendored
6
.gitignore
vendored
|
@ -40,4 +40,8 @@ site
|
|||
# temporal github pages
|
||||
gh-pages
|
||||
|
||||
test/binaries
|
||||
# Docker-based builds
|
||||
/test/binaries
|
||||
/.env
|
||||
/.gocache/
|
||||
/bin/
|
||||
|
|
6
Makefile
6
Makefile
|
@ -168,7 +168,7 @@ static-check:
|
|||
test:
|
||||
@$(DEF_VARS) \
|
||||
NODE_IP=$(NODE_IP) \
|
||||
DOCKER_OPTS="--net=host" \
|
||||
DOCKER_OPTS="-i --net=host" \
|
||||
build/go-in-docker.sh build/test.sh
|
||||
|
||||
.PHONY: lua-test
|
||||
|
@ -182,14 +182,14 @@ e2e-test:
|
|||
@$(DEF_VARS) \
|
||||
FOCUS=$(FOCUS) \
|
||||
E2E_NODES=$(E2E_NODES) \
|
||||
DOCKER_OPTS="--net=host" \
|
||||
DOCKER_OPTS="-i --net=host" \
|
||||
NODE_IP=$(NODE_IP) \
|
||||
build/go-in-docker.sh build/e2e-tests.sh
|
||||
|
||||
.PHONY: cover
|
||||
cover:
|
||||
@$(DEF_VARS) \
|
||||
DOCKER_OPTS="--net=host" \
|
||||
DOCKER_OPTS="-i --net=host" \
|
||||
build/go-in-docker.sh build/cover.sh
|
||||
|
||||
echo "Uploading coverage results..."
|
||||
|
|
|
@ -52,6 +52,7 @@ fi
|
|||
|
||||
ginkgo build ./test/e2e
|
||||
|
||||
exec -- \
|
||||
ginkgo \
|
||||
-randomizeSuites \
|
||||
-randomizeAllSpecs \
|
||||
|
|
|
@ -72,6 +72,7 @@ docker run \
|
|||
-v ${HOME}/.kube:/${HOME}/.kube \
|
||||
-v ${HOME}/.minikube:${HOME}/.minikube \
|
||||
-v ${PWD}:/go/src/${PKG} \
|
||||
-v ${PWD}/.gocache:${HOME}/.cache/go-build \
|
||||
-v ${PWD}/bin/${ARCH}:/go/bin/linux_${ARCH} \
|
||||
-w /go/src/${PKG} \
|
||||
--env-file .env \
|
||||
|
|
|
@ -53,3 +53,9 @@ func RunE2ETests(t *testing.T) {
|
|||
glog.Infof("Starting e2e run %q on Ginkgo node %d", framework.RunID, config.GinkgoConfig.ParallelNode)
|
||||
ginkgo.RunSpecs(t, "nginx-ingress-controller e2e suite")
|
||||
}
|
||||
|
||||
var _ = ginkgo.SynchronizedAfterSuite(func() {
|
||||
// Run on all Ginkgo nodes
|
||||
framework.Logf("Running AfterSuite actions on all nodes")
|
||||
framework.RunCleanupActions()
|
||||
}, func() {})
|
||||
|
|
Loading…
Reference in a new issue