Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ all: bin/tkn test

FORCE:

vendor:
vendor:
@go mod vendor

.PHONY: cross
Expand Down Expand Up @@ -57,7 +57,7 @@ test-unit: ./vendor ## run unit tests
@go test -failfast -v -cover ./...

.PHONY: test-e2e
test-e2e: ./vendor ## run e2e tests
test-e2e: bin/tkn ## run e2e tests
@echo "Running e2e tests..."
@LOCAL_CI_RUN=true bash ./test/e2e-tests.sh

Expand Down
11 changes: 7 additions & 4 deletions test/e2e-tests.sh
Original file line number Diff line number Diff line change
Expand Up @@ -30,15 +30,18 @@ ci_run && {
# Run the integration tests
ci_run && {
header "Running Go e2e tests"
local failed=0
failed=0
go_test_e2e ./test || failed=1
(( failed )) && fail_test
}

go build github.com/tektoncd/cli/cmd/tkn

tkn() {
./tkn "$@"
if [[ -e ./bin/tkn ]];then
./bin/tkn $@
else
go build github.com/tektoncd/cli/cmd/tkn
./tkn "$@"
fi
}

kubectl get crds|grep tekton\\.dev && fail_test "TektonCD CRDS should not be installed, you should reset them before each runs"
Expand Down