feat: add Elastic Stack and Elastic Package version to test results

Author: teresaromero

internal/testrunner/reporters/formats/human.go

@@ -48,7 +48,7 @@ func reportHumanFormat(results []testrunner.TestResult) (string, error) {
 	}
 
 	t := table.NewWriter()
-	t.AppendHeader(table.Row{"Package", "Data stream", "Test type", "Test name", "Result", "Time elapsed"})
+	t.AppendHeader(table.Row{"Package", "Data stream", "Test type", "Test name", "Result", "Stack version", "EP version", "Time elapsed"})
 
 	for _, r := range results {
 		var result string
@@ -62,7 +62,16 @@ func reportHumanFormat(results []testrunner.TestResult) (string, error) {
 			result = "PASS"
 		}
 
-		t.AppendRow(table.Row{r.Package, r.DataStream, r.TestType, r.Name, result, r.TimeElapsed})
+		stackVersion := r.ElasticStackVersion
+		if stackVersion == "" {
+			stackVersion = "N/A"
+		}
+		epVersion := r.ElasticPackageVersion
+		if epVersion == "" {
+			epVersion = "N/A"
+		}
+
+		t.AppendRow(table.Row{r.Package, r.DataStream, r.TestType, r.Name, result, stackVersion, epVersion, r.TimeElapsed})
 	}
 
 	t.SetStyle(table.StyleRounded)

internal/testrunner/reporters/formats/xunit.go

@@ -41,6 +41,9 @@ type testCase struct {
 	ClassName     string  `xml:"classname,attr"`
 	TimeInSeconds float64 `xml:"time,attr"`
 
+	StackVersion          string `xml:"stack-version,attr,omitempty"`
+	ElasticPackageVersion string `xml:"elastic-package-version,attr,omitempty"`
+
 	Error   string   `xml:"error,omitempty"`
 	Failure string   `xml:"failure,omitempty"`
 	Skipped *skipped `xml:"skipped,omitempty"`
@@ -93,11 +96,13 @@ func reportXUnitFormat(results []testrunner.TestResult) (string, error) {
 		}
 
 		c := testCase{
-			Name:          name,
-			ClassName:     fmt.Sprintf("%s.%s", r.Package, r.DataStream),
-			TimeInSeconds: r.TimeElapsed.Seconds(),
-			Error:         r.ErrorMsg,
-			Failure:       failure,
+			Name:                  name,
+			ClassName:             fmt.Sprintf("%s.%s", r.Package, r.DataStream),
+			TimeInSeconds:         r.TimeElapsed.Seconds(),
+			StackVersion:          r.ElasticStackVersion,
+			ElasticPackageVersion: r.ElasticPackageVersion,
+			Error:                 r.ErrorMsg,
+			Failure:               failure,
 		}
 
 		if r.Skipped != nil {

internal/testrunner/runners/system/tester.go

@@ -38,6 +38,7 @@ import (
 	"github.com/elastic/elastic-package/internal/servicedeployer"
 	"github.com/elastic/elastic-package/internal/stack"
 	"github.com/elastic/elastic-package/internal/testrunner"
+	"github.com/elastic/elastic-package/internal/version"
 	"github.com/elastic/elastic-package/internal/wait"
 )
 
@@ -640,10 +641,12 @@ func (r *tester) tearDownTest(ctx context.Context) error {
 
 func (r *tester) newResult(name string) *testrunner.ResultComposer {
 	return testrunner.NewResultComposer(testrunner.TestResult{
-		TestType:   TestType,
-		Name:       name,
-		Package:    r.testFolder.Package,
-		DataStream: r.testFolder.DataStream,
+		TestType:              TestType,
+		Name:                  name,
+		Package:               r.testFolder.Package,
+		DataStream:            r.testFolder.DataStream,
+		ElasticStackVersion:   r.stackVersion.Version(),
+		ElasticPackageVersion: version.String(),
 	})
 }
 
@@ -920,12 +923,14 @@ func (r *tester) checkDeprecationWarnings(stackVersion *semver.Version, warnings
 			details = fmt.Sprintf("%s (index: %s)", details, warning.index)
 		}
 		tr := testrunner.TestResult{
-			TestType:       TestType,
-			Name:           "Deprecation warnings - " + configName,
-			Package:        r.testFolder.Package,
-			DataStream:     r.testFolder.DataStream,
-			FailureMsg:     warning.Message,
-			FailureDetails: details,
+			TestType:              TestType,
+			Name:                  "Deprecation warnings - " + configName,
+			Package:               r.testFolder.Package,
+			DataStream:            r.testFolder.DataStream,
+			FailureMsg:            warning.Message,
+			FailureDetails:        details,
+			ElasticStackVersion:   r.stackVersion.Version(),
+			ElasticPackageVersion: version.String(),
 		}
 		results = append(results, tr)
 	}
@@ -2514,10 +2519,12 @@ func (r *tester) checkNewAgentLogs(ctx context.Context, agent agentdeployer.Depl
 		err = r.anyErrorMessages(f.Name(), startTesting, patternsContainer.patterns)
 		if e, ok := err.(testrunner.ErrTestCaseFailed); ok {
 			tr := testrunner.TestResult{
-				TestType:   TestType,
-				Name:       fmt.Sprintf("(%s logs - %s)", patternsContainer.containerName, configName),
-				Package:    r.testFolder.Package,
-				DataStream: r.testFolder.DataStream,
+				TestType:              TestType,
+				Name:                  fmt.Sprintf("(%s logs - %s)", patternsContainer.containerName, configName),
+				Package:               r.testFolder.Package,
+				DataStream:            r.testFolder.DataStream,
+				ElasticStackVersion:   r.stackVersion.Version(),
+				ElasticPackageVersion: version.String(),
 			}
 			tr.FailureMsg = e.Error()
 			tr.FailureDetails = e.Details
@@ -2551,10 +2558,12 @@ func (r *tester) checkAgentLogs(dump []stack.DumpResult, startTesting time.Time,
 		err = r.anyErrorMessages(serviceLogsFile, startTesting, patternsContainer.patterns)
 		if e, ok := err.(testrunner.ErrTestCaseFailed); ok {
 			tr := testrunner.TestResult{
-				TestType:   TestType,
-				Name:       fmt.Sprintf("(%s logs)", patternsContainer.containerName),
-				Package:    r.testFolder.Package,
-				DataStream: r.testFolder.DataStream,
+				TestType:              TestType,
+				Name:                  fmt.Sprintf("(%s logs)", patternsContainer.containerName),
+				Package:               r.testFolder.Package,
+				DataStream:            r.testFolder.DataStream,
+				ElasticStackVersion:   r.stackVersion.Version(),
+				ElasticPackageVersion: version.String(),
 			}
 			tr.FailureMsg = e.Error()
 			tr.FailureDetails = e.Details

internal/testrunner/testrunner.go

@@ -123,6 +123,12 @@ type TestResult struct {
 
 	// Coverage details in Cobertura format (optional).
 	Coverage CoverageReport
+
+	// Elastic Stack version
+	ElasticStackVersion string
+
+	// ElasticPackage version
+	ElasticPackageVersion string
 }
 
 // ResultComposer wraps a TestResult and provides convenience methods for

internal/version/version.go

@@ -5,8 +5,10 @@
 package version
 
 import (
+	"fmt"
 	"runtime/debug"
 	"strconv"
+	"strings"
 	"time"
 )
 
@@ -44,3 +46,14 @@ func BuildTimeFormatted() string {
 	}
 	return time.Unix(seconds, 0).Format(time.RFC3339)
 }
+
+// String returns a formatted version string for elastic-package.
+// Format: "tag version-hash commitHash (build time: buildTime)" or just "version-hash commitHash" if no tag.
+func String() string {
+	var parts []string
+	if Tag != "" {
+		parts = append(parts, Tag)
+	}
+	parts = append(parts, fmt.Sprintf("version-hash %s (build time: %s)", CommitHash, BuildTimeFormatted()))
+	return strings.Join(parts, " ")
+}