From 1b9b7482777e19006f6ad25efd1ffedf7916e767 Mon Sep 17 00:00:00 2001
From: lichuqiang <lichuqiang@huawei.com>
Date: Wed, 30 May 2018 10:36:01 +0800
Subject: [PATCH] address comments

---
 test/e2e/config.go                   | 2 +-
 test/e2e/e2e.go                      | 1 -
 test/internal/e2e/kubebuildertest.go | 2 +-
 3 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/test/e2e/config.go b/test/e2e/config.go
index 4b1cfeb18d..49a50ff743 100644
--- a/test/e2e/config.go
+++ b/test/e2e/config.go
@@ -48,7 +48,7 @@ func initConfig(testSuffix string) *config {
 		kind:                "Foo" + testSuffix,
 		installName:         installName,
 		namespace:           testNamespace,
-		controllerImageName: "gcr.io/kubeships/controller-manager:" + testSuffix,
+		controllerImageName: "e2e-test/controller-manager:" + testSuffix,
 		workDir:             filepath.Join(framework.TestContext.ProjectDir, "e2e-"+testSuffix),
 	}
 }
diff --git a/test/e2e/e2e.go b/test/e2e/e2e.go
index 20c33071fe..40c81d2a7c 100644
--- a/test/e2e/e2e.go
+++ b/test/e2e/e2e.go
@@ -29,7 +29,6 @@ import (
 	"github.com/kubernetes-sigs/kubebuilder/test/e2e/framework"
 	"github.com/kubernetes-sigs/kubebuilder/test/e2e/framework/ginkgowrapper"
 	e2einternal "github.com/kubernetes-sigs/kubebuilder/test/internal/e2e"
-
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
 
diff --git a/test/internal/e2e/kubebuildertest.go b/test/internal/e2e/kubebuildertest.go
index f4b2245579..6310a1cea2 100644
--- a/test/internal/e2e/kubebuildertest.go
+++ b/test/internal/e2e/kubebuildertest.go
@@ -191,7 +191,7 @@ func (kt *KubebuilderTest) runCommand(cmd *exec.Cmd) ([]byte, error) {
 	command := strings.Join(cmd.Args, " ")
 	output, err := cmd.Output()
 	if err != nil {
-		return output, fmt.Errorf("%s failed with error: %v", command, err)
+		return output, fmt.Errorf("%s failed with error: %s", command, string(output))
 	}
 	log.Printf("%s finished successfully", command)
 	return output, nil