Merge pull request #595 from mattcary/artifact-name

k8s-ci-robot · web-flow · commit 42e18f7fa261 · 2020-08-27T20:32:53.000-07:00
Strip .yaml from test output dirs
diff --git a/test/k8s-integration/main.go b/test/k8s-integration/main.go
@@ -370,12 +370,15 @@ func handle() error {
 	if len(*storageClassFiles) != 0 {
 		storageClasses := strings.Split(*storageClassFiles, ",")
 		var ginkgoErrors []string
+		var testOutputDirs []string
 		for _, scFile := range storageClasses {
-			if err = runCSITests(*platform, pkgDir, testDir, *testFocus, testSkip, scFile, *snapshotClassFile, cloudProviderArgs, *deploymentStrat, scFile); err != nil {
+			outputDir := strings.TrimSuffix(scFile, ".yaml")
+			testOutputDirs = append(testOutputDirs, outputDir)
+			if err = runCSITests(*platform, pkgDir, testDir, *testFocus, testSkip, scFile, *snapshotClassFile, cloudProviderArgs, *deploymentStrat, outputDir); err != nil {
 				ginkgoErrors = append(ginkgoErrors, err.Error())
 			}
 		}
-		if err = mergeArtifacts(storageClasses); err != nil {
+		if err = mergeArtifacts(testOutputDirs); err != nil {
 			return fmt.Errorf("artifact merging failed: %w", err)
 		}
 		if ginkgoErrors != nil {

Original file line number	Diff line number	Diff line change
`@@ -370,12 +370,15 @@ func handle() error {`
`370`	`370`	`if len(*storageClassFiles) != 0 {`
`371`	`371`	`storageClasses := strings.Split(*storageClassFiles, ",")`
`372`	`372`	`var ginkgoErrors []string`
	`373`	`+ var testOutputDirs []string`
`373`	`374`	`for _, scFile := range storageClasses {`
`374`		`- if err = runCSITests(platform, pkgDir, testDir, testFocus, testSkip, scFile, snapshotClassFile, cloudProviderArgs, deploymentStrat, scFile); err != nil {`
	`375`	`+ outputDir := strings.TrimSuffix(scFile, ".yaml")`
	`376`	`+ testOutputDirs = append(testOutputDirs, outputDir)`
	`377`	`+ if err = runCSITests(platform, pkgDir, testDir, testFocus, testSkip, scFile, snapshotClassFile, cloudProviderArgs, deploymentStrat, outputDir); err != nil {`
`375`	`378`	`ginkgoErrors = append(ginkgoErrors, err.Error())`
`376`	`379`	`}`
`377`	`380`	`}`
`378`		`- if err = mergeArtifacts(storageClasses); err != nil {`
	`381`	`+ if err = mergeArtifacts(testOutputDirs); err != nil {`
`379`	`382`	`return fmt.Errorf("artifact merging failed: %w", err)`
`380`	`383`	`}`
`381`	`384`	`if ginkgoErrors != nil {`