fix(e2e): remove hardcoded image names

pull/606/head
Adam Reese 10 years ago
parent 1d6194d8a5
commit b380e64d94

@ -16,19 +16,18 @@ func init() {
} }
const ( const (
timeout = 10 * time.Second timeout = 20 * time.Second
poll = 2 * time.Second poll = 2 * time.Second
) )
var ( var (
repoURL = flag.String("repo-url", "gs://kubernetes-charts-testing", "Repository URL") repoURL = flag.String("repo-url", "gs://kubernetes-charts-testing", "Repository URL")
repoName = flag.String("repo-name", "kubernetes-charts-testing", "Repository name") repoName = flag.String("repo-name", "kubernetes-charts-testing", "Repository name")
chart = flag.String("chart", "gs://kubernetes-charts-testing/redis-2.tgz", "Chart to deploy") chart = flag.String("chart", "gs://kubernetes-charts-testing/redis-2.tgz", "Chart to deploy")
host = flag.String("host", "", "The URL to the helm server") host = flag.String("host", "", "The URL to the helm server")
resourcifierImage = flag.String("resourcifier-image", "", "The full image name of the Docker image for resourcifier.")
resourcifierImage = "quay.io/adamreese/resourcifier:latest" expandybirdImage = flag.String("expandybird-image", "", "The full image name of the Docker image for expandybird.")
expandybirdImage = "quay.io/adamreese/expandybird:latest" managerImage = flag.String("manager-image", "", "The full image name of the Docker image for manager.")
managerImage = "quay.io/adamreese/manager:latest"
) )
func logKubeEnv(k *KubeContext) { func logKubeEnv(k *KubeContext) {
@ -54,16 +53,12 @@ func TestHelm(t *testing.T) {
} }
t.Logf("Using host: %v", helm.Host) t.Logf("Using host: %v", helm.Host)
//TODO: skip check if running local binaries //TODO skip check if running local binaries
if !helm.Running() { if !helm.Running() {
t.Error("Helm is not installed") t.Error("Helm is not installed")
helm.MustRun(
"server", //TODO wire in flag overides
"install", helm.MustRun("server", "install")
"--resourcifier-image", resourcifierImage,
"--expandybird-image", expandybirdImage,
"--manager-image", managerImage,
)
if err := wait(helm.Running); err != nil { if err := wait(helm.Running); err != nil {
t.Fatal(err) t.Fatal(err)
} }

Loading…
Cancel
Save