From c1aa3384f5640f8b2ab53604c47c74577825ec03 Mon Sep 17 00:00:00 2001 From: Vaughn Dice Date: Tue, 28 Jun 2016 15:15:03 -0600 Subject: [PATCH] chore(actions/common.go): update filename for e2e chart As location of e2e pod name will have changed in https://github.com/deis/charts/pull/299. Therefore, this PR depends on https://github.com/deis/charts/pull/299 being merged. --- actions/common.go | 2 +- actions/helm_stage.go | 18 +++++++++--------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/actions/common.go b/actions/common.go index 9138232..d6cccd0 100644 --- a/actions/common.go +++ b/actions/common.go @@ -111,7 +111,7 @@ var ( Files: []string{ "README.md", "Chart.yaml", - filepath.Join("tpl", "workflow-e2e-pod.yaml"), + filepath.Join("tpl", "generate_params.toml"), }, } ) diff --git a/actions/helm_stage.go b/actions/helm_stage.go index 1086fe6..aa00ffc 100644 --- a/actions/helm_stage.go +++ b/actions/helm_stage.go @@ -32,6 +32,15 @@ func helmStage(ghClient *github.Client, c *cli.Context, helmChart helmChart) { log.Fatalf("Error creating dir %s (%s)", filepath.Join(stagingDir, "tpl"), err) } + // stage 'tpl/generate_params.toml' with latest git shas for each component + defaultParamsComponentAttrs := genParamsComponentAttrs{ + Org: c.GlobalString(OrgFlag), + PullPolicy: c.GlobalString(PullPolicyFlag), + Tag: c.GlobalString(TagFlag), + } + paramsComponentMap := getParamsComponentMap(ghClient, defaultParamsComponentAttrs, helmChart.Template, c.GlobalString(RefFlag)) + generateParams(ourFS, stagingDir, paramsComponentMap, helmChart) + // gather helmChart.Files from GitHub needing release string updates ghFiles, err := downloadFiles(ghClient, org, repo, &opt, helmChart) if err != nil { @@ -42,15 +51,6 @@ func helmStage(ghClient *github.Client, c *cli.Context, helmChart helmChart) { if err := updateFilesWithRelease(ourFP, ourFS, deisRelease, stagingDir); err != nil { log.Fatalf("Error updating files with release '%s' (%s)", deisRelease.Short, err) } - - // stage 'tpl/generate_params.toml' with latest git shas for each component - defaultParamsComponentAttrs := genParamsComponentAttrs{ - Org: c.GlobalString(OrgFlag), - PullPolicy: c.GlobalString(PullPolicyFlag), - Tag: c.GlobalString(TagFlag), - } - paramsComponentMap := getParamsComponentMap(ghClient, defaultParamsComponentAttrs, helmChart.Template, c.GlobalString(RefFlag)) - generateParams(ourFS, stagingDir, paramsComponentMap, helmChart) } func createDir(fs sys.FS, dirName string) error {