Skip to content

Commit

Permalink
Merge pull request #8 from roberthbailey/unit-tests
Browse files Browse the repository at this point in the history 
Update scripts for running CI automation.
  • Loading branch information
Phillip Wittrock committed Sep 26, 2018
2 parents 4eeba4c + 7ae82ff commit 1246c3f
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 5 deletions.
4 changes: 2 additions & 2 deletions Makefile
View file
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@

# Image URL to use all building/pushing image targets
IMG ?= controller:latest
IMG ?= gcr.io/k8s-cluster-api/cluster-api-controller:latest

all: test manager clusterctl

# Run tests
test: generate fmt vet manifests
go test ./pkg/... ./cmd/... -coverprofile cover.out
go test -v -tags=integration ./pkg/... ./cmd/... -coverprofile cover.out

# Build manager binary
manager: generate fmt vet
Expand Down
2 changes: 1 addition & 1 deletion scripts/ci-build.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,4 +20,4 @@ set -o pipefail

REPO_ROOT=$(dirname "${BASH_SOURCE}")/..

go build "${REPO_ROOT}"/...
cd $REPO_ROOT && make manager clusterctl
2 changes: 1 addition & 1 deletion scripts/ci-make.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,4 +20,4 @@ set -o pipefail

REPO_ROOT=$(dirname "${BASH_SOURCE}")/..

cd $REPO_ROOT && make all
cd $REPO_ROOT && make docker-build
2 changes: 1 addition & 1 deletion scripts/ci-test.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,4 +20,4 @@ set -o pipefail

REPO_ROOT=$(dirname "${BASH_SOURCE}")/..

go test -v -tags=integration "${REPO_ROOT}"/...
cd $REPO_ROOT && make test

0 comments on commit 1246c3f

Please sign in to comment.