Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix e2e make targets #62

Merged
merged 1 commit into from
Dec 15, 2016
Merged

Fix e2e make targets #62

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
1 change: 0 additions & 1 deletion .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,5 +30,4 @@ before_script:

script:
- make fmt lint vet cover
#- make controllers controllers-images
#- make test-e2e
8 changes: 6 additions & 2 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,10 +59,14 @@ clean:
controllers:
make -C controllers/nginx build

.PHONY: controllers-images
controllers-images:
.PHONY: docker-build
docker-build: controllers
make -C controllers/nginx container

.PHONY: docker-push
docker-push: docker-build
make -C controllers/nginx push

.PHONY: ginkgo
ginkgo:
go get github.com/onsi/ginkgo/ginkgo
4 changes: 2 additions & 2 deletions hack/e2e.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ func validWorkingDirectory() error {
if err != nil {
return fmt.Errorf("failed to convert %s to an absolute path: %v", cwd, err)
}
if !strings.Contains(filepath.Base(acwd), "ingress-controller") {
if !strings.Contains(filepath.Base(acwd), "ingress") {
return fmt.Errorf("must run from git root directory: %v", acwd)
}
return nil
Expand Down Expand Up @@ -214,7 +214,7 @@ func run(deploy deployer) error {
func Build() error {
// The build-release script needs stdin to ask the user whether
// it's OK to download the docker image.
cmd := exec.Command("make", "backends", "backends-images", "backends-push")
cmd := exec.Command("make", "docker-build", "docker-push")
cmd.Stdin = os.Stdin
if err := finishRunning("build-release", cmd); err != nil {
return fmt.Errorf("error building: %v", err)
Expand Down