fields for buildkite and ymal

go-vela · Jan 20, 2025 · 05a09bb · 05a09bb
1 parent 14660f5
commit 05a09bb
Show file tree

Hide file tree

Showing 6 changed files with 42 additions and 6 deletions.
diff --git a/compiler/types/yaml/buildkite/step.go b/compiler/types/yaml/buildkite/step.go
@@ -61,6 +61,7 @@ func (s *StepSlice) ToPipeline() *pipeline.ContainerSlice {
 			Pull:        step.Pull,
 			Ruleset:     *step.Ruleset.ToPipeline(),
 			Secrets:     *step.Secrets.ToPipeline(),
+			TestReport:  *step.TestReport.ToPipeline(),
 			Ulimits:     *step.Ulimits.ToPipeline(),
 			Volumes:     *step.Volumes.ToPipeline(),
 			User:        step.User,
@@ -166,6 +167,7 @@ func (s *Step) ToYAML() *yaml.Step {
 		Ruleset:     *s.Ruleset.ToYAML(),
 		Secrets:     *s.Secrets.ToYAML(),
 		Template:    s.Template.ToYAML(),
+		TestReport:  s.TestReport.ToYAML(),
 		Ulimits:     *s.Ulimits.ToYAML(),
 		Volumes:     *s.Volumes.ToYAML(),
 		Parameters:  s.Parameters,

diff --git a/compiler/types/yaml/buildkite/step_test.go b/compiler/types/yaml/buildkite/step_test.go
@@ -77,8 +77,8 @@ func TestYaml_StepSlice_ToPipeline(t *testing.T) {
 						},
 					},
 					TestReport: TestReport{
-						Results:     []string{"test.txt"},
-						Attachments: []string{"test.log"},
+						Results:     []string{"test-results/*.xml"},
+						Attachments: []string{"screenshots/**/*.png", " video/*.mp4"},
 					},
 				},
 			},
@@ -139,8 +139,8 @@ func TestYaml_StepSlice_ToPipeline(t *testing.T) {
 						},
 					},
 					TestReport: pipeline.TestReport{
-						Results:     []string{"test.txt"},
-						Attachments: []string{"test.log"},
+						Results:     []string{"test-results/*.xml"},
+						Attachments: []string{"screenshots/**/*.png", " video/*.mp4"},
 					},
 				},
 			},

diff --git a/compiler/types/yaml/buildkite/test_report.go b/compiler/types/yaml/buildkite/test_report.go
@@ -1,6 +1,9 @@
 package buildkite
 
-import "github.com/go-vela/server/compiler/types/pipeline"
+import (
+	"github.com/go-vela/server/compiler/types/pipeline"
+	"github.com/go-vela/server/compiler/types/yaml/yaml"
+)
 
 // TestReport represents the structure for test report configuration.
 type TestReport struct {
@@ -38,3 +41,10 @@ func (t *TestReport) UnmarshalYAML(unmarshal func(interface{}) error) error {
 
 	return nil
 }
+
+func (t *TestReport) ToYAML() yaml.TestReport {
+	return yaml.TestReport{
+		Results:     t.Results,
+		Attachments: t.Attachments,
+	}
+}
diff --git a/compiler/types/yaml/buildkite/testdata/step.yml b/compiler/types/yaml/buildkite/testdata/step.yml
@@ -44,3 +44,10 @@
       registry: index.docker.io
       repo: github/octocat
       tags: [ latest, dev ]
+
+- name: test-reports
+  image: golang:1.20
+  pull: true
+  test_report:
+    results: ["test-results/*.xml"]
+    attachments: ["screenshots/**/*.png", " video/*.mp4"]
diff --git a/compiler/types/yaml/yaml/step.go b/compiler/types/yaml/yaml/step.go
@@ -60,12 +60,12 @@ func (s *StepSlice) ToPipeline() *pipeline.ContainerSlice {
 			Pull:        step.Pull,
 			Ruleset:     *step.Ruleset.ToPipeline(),
 			Secrets:     *step.Secrets.ToPipeline(),
+			TestReport:  *step.TestReport.ToPipeline(),
 			Ulimits:     *step.Ulimits.ToPipeline(),
 			Volumes:     *step.Volumes.ToPipeline(),
 			User:        step.User,
 			ReportAs:    step.ReportAs,
 			IDRequest:   step.IDRequest,
-			TestReport:  *step.TestReport.ToPipeline(),
 		})
 	}
 

diff --git a/compiler/types/yaml/yaml/step_test.go b/compiler/types/yaml/yaml/step_test.go
@@ -76,6 +76,10 @@ func TestYaml_StepSlice_ToPipeline(t *testing.T) {
 							AccessMode:  "ro",
 						},
 					},
+					TestReport: TestReport{
+						Results:     []string{"test-results/*.xml"},
+						Attachments: []string{"screenshots/**/*.png", " video/*.mp4"},
+					},
 				},
 			},
 			want: &pipeline.ContainerSlice{
@@ -134,6 +138,10 @@ func TestYaml_StepSlice_ToPipeline(t *testing.T) {
 							AccessMode:  "ro",
 						},
 					},
+					TestReport: pipeline.TestReport{
+						Results:     []string{"test-results/*.xml"},
+						Attachments: []string{"screenshots/**/*.png", " video/*.mp4"},
+					},
 				},
 			},
 		},
@@ -213,6 +221,15 @@ func TestYaml_StepSlice_UnmarshalYAML(t *testing.T) {
 						},
 					},
 				},
+				{
+					Name:  "test-reports",
+					Image: "golang:1.20",
+					Pull:  "always",
+					TestReport: TestReport{
+						Results:     []string{"test-results/*.xml"},
+						Attachments: []string{"screenshots/**/*.png", " video/*.mp4"},
+					},
+				},
 			},
 		},
 		{