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

Fix e2e make targets

Browse source
This commit is contained in:
Manuel de Brito Fontes 2016-12-15 09:50:02 -03:00
parent ac6930b2e7
commit 6895e71f80
3 changed files with 8 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

4
hack/e2e.go
View file

@ -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
@ -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)