DevFW-CICD/ingress-nginx-helm
14
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #62 from aledbf/fix-e2e-start

Browse source 
Fix e2e make targets
This commit is contained in:
Manuel Alejandro de Brito Fontes 2016-12-15 10:42:34 -03:00 committed by GitHub
commit 88780f77f6
3 changed files with 8 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
.travis.yml
View file

@ -30,5 +30,4 @@ before_script:
script: script:
- make fmt lint vet cover - make fmt lint vet cover
#- make controllers controllers-images
#- make test-e2e #- make test-e2e

8
Makefile
View file

@ -59,10 +59,14 @@ clean:
controllers: controllers:
make -C controllers/nginx build make -C controllers/nginx build
.PHONY: controllers-images .PHONY: docker-build
controllers-images: docker-build: controllers
make -C controllers/nginx container make -C controllers/nginx container
.PHONY: docker-push
docker-push: docker-build
make -C controllers/nginx push
.PHONY: ginkgo .PHONY: ginkgo
ginkgo: ginkgo:
go get github.com/onsi/ginkgo/ginkgo go get github.com/onsi/ginkgo/ginkgo

4
hack/e2e.go
View file

@ -57,7 +57,7 @@ func validWorkingDirectory() error {
if err != nil { if err != nil {
return fmt.Errorf("failed to convert %s to an absolute path: %v", cwd, err) 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 fmt.Errorf("must run from git root directory: %v", acwd)
} }
return nil return nil
@ -214,7 +214,7 @@ func run(deploy deployer) error {
func Build() error { func Build() error {
// The build-release script needs stdin to ask the user whether // The build-release script needs stdin to ask the user whether
// it's OK to download the docker image. // 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 cmd.Stdin = os.Stdin
if err := finishRunning("build-release", cmd); err != nil { if err := finishRunning("build-release", cmd); err != nil {
return fmt.Errorf("error building: %v", err) return fmt.Errorf("error building: %v", err)