chore(actions/common.go): update filename for e2e chart

As location of e2e pod name will have changed in deis/charts#299. Therefore, this PR depends on deis/charts#299 being merged.
deis · Jun 28, 2016 · c1aa338 · c1aa338
1 parent 5dea530
commit c1aa338
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 10 deletions.
diff --git 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
@@ -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 {