Update installation/uninstallation package process in system tests

.buildkite/pipeline.trigger.integration.tests.sh

@@ -96,7 +96,6 @@ for package in $(find . -maxdepth 1 -mindepth 1 -type d) ; do
         label_suffix=" (independent agent)"
     fi
     package_name=$(basename "${package}")
-
     if [[ "$independent_agent" == "false" && "$package_name" == "oracle" ]]; then
         echoerr "Package \"${package_name}\" skipped: not supported with Elastic Agent running in the stack (missing required software)."
         continue

cmd/testrunner.go

@@ -337,25 +337,31 @@ func testTypeCommandActionFactory(runner testrunner.TestRunner) cobraext.Command
 			fmt.Printf("Running tests per stages (technical preview)\n")
 		}
 
+		runnerOptions := testrunner.TestOptions{
+			Profile:                    profile,
+			PackageRootPath:            packageRootPath,
+			GenerateTestResult:         generateTestResult,
+			API:                        esAPI,
+			KibanaClient:               kibanaClient,
+			DeferCleanup:               deferCleanup,
+			ServiceVariant:             variantFlag,
+			WithCoverage:               testCoverage,
+			CoverageType:               testCoverageFormat,
+			ConfigFilePath:             configFileFlag,
+			RunSetup:                   runSetup,
+			RunTearDown:                runTearDown,
+			RunTestsOnly:               runTestsOnly,
+			RunIndependentElasticAgent: false,
+		}
+		err = runner.SetupRunner(ctx, runnerOptions)
+		if err != nil {
+			return fmt.Errorf("failed to run setup runner process: %w", err)
+		}
+
 		var results []testrunner.TestResult
 		for _, folder := range testFolders {
-			r, err := testrunner.Run(ctx, testType, testrunner.TestOptions{
-				Profile:                    profile,
-				TestFolder:                 folder,
-				PackageRootPath:            packageRootPath,
-				GenerateTestResult:         generateTestResult,
-				API:                        esAPI,
-				KibanaClient:               kibanaClient,
-				DeferCleanup:               deferCleanup,
-				ServiceVariant:             variantFlag,
-				WithCoverage:               testCoverage,
-				CoverageType:               testCoverageFormat,
-				ConfigFilePath:             configFileFlag,
-				RunSetup:                   runSetup,
-				RunTearDown:                runTearDown,
-				RunTestsOnly:               runTestsOnly,
-				RunIndependentElasticAgent: false,
-			})
+			runnerOptions.TestFolder = folder
+			r, err := testrunner.Run(ctx, runner, runnerOptions)
 
 			// Results must be appended even if there is an error, since there could be
 			// tests (e.g. system tests) that return both error and results.
@@ -367,6 +373,11 @@ func testTypeCommandActionFactory(runner testrunner.TestRunner) cobraext.Command
 
 		}
 
+		err = runner.TearDownRunner(ctx)
+		if err != nil {
+			return fmt.Errorf("failed to run tear down runner process: %w", err)
+		}
+
 		format := testrunner.TestReportFormat(reportFormat)
 		report, err := testrunner.FormatReport(format, results)
 		if err != nil {
@@ -390,6 +401,7 @@ func testTypeCommandActionFactory(runner testrunner.TestRunner) cobraext.Command
 				return errors.New("one or more test cases failed")
 			}
 		}
+
 		return nil
 	}
 }

internal/agentdeployer/agent.go

@@ -391,12 +391,12 @@ func (s *dockerComposeDeployedAgent) TearDown(ctx context.Context) error {
 	defer func() {
 		// Remove the service logs dir for this agent
 		if err := os.RemoveAll(s.agentInfo.Logs.Folder.Local); err != nil {
-			logger.Errorf("could not remove the agent logs (path: %s): %w", s.agentInfo.Logs.Folder.Local, err)
+			logger.Errorf("could not remove the agent logs (path: %s): %v", s.agentInfo.Logs.Folder.Local, err)
 		}
 
 		// Remove the configuration dir for this agent (e.g. compose scenario files)
 		if err := os.RemoveAll(s.agentInfo.ConfigDir); err != nil {
-			logger.Errorf("could not remove the agent configuration directory (path: %s) %w", s.agentInfo.ConfigDir, err)
+			logger.Errorf("could not remove the agent configuration directory (path: %s) %v", s.agentInfo.ConfigDir, err)
 		}
 	}()
 

internal/servicedeployer/compose.go

@@ -98,7 +98,7 @@ func (d *DockerComposeServiceDeployer) SetUp(ctx context.Context, svcInfo Servic
 		// service logs folder must no be deleted to avoid breaking log files written
 		// by the service. If this is required, those files should be rotated or truncated
 		// so the service can still write to them.
-		logger.Debug("Skipping removing service logs folder folder %s", svcInfo.Logs.Folder.Local)
+		logger.Debugf("Skipping removing service logs folder folder %s", svcInfo.Logs.Folder.Local)
 	} else {
 		err = files.RemoveContent(svcInfo.Logs.Folder.Local)
 		if err != nil {
@@ -242,7 +242,7 @@ func (s *dockerComposeDeployedService) TearDown(ctx context.Context) error {
 		}
 		// Remove the outputs generated by the service container
 		if err = os.RemoveAll(s.svcInfo.OutputDir); err != nil {
-			logger.Errorf("could not remove the temporary output files %w", err)
+			logger.Errorf("could not remove the temporary output files %s", err)
 		}
 	}()
 

internal/servicedeployer/custom_agent.go

@@ -129,7 +129,7 @@ func (d *CustomAgentDeployer) SetUp(ctx context.Context, svcInfo ServiceInfo) (D
 		// service logs folder must no be deleted to avoid breaking log files written
 		// by the service. If this is required, those files should be rotated or truncated
 		// so the service can still write to them.
-		logger.Debug("Skipping removing service logs folder folder %s", svcInfo.Logs.Folder.Local)
+		logger.Debugf("Skipping removing service logs folder folder %s", svcInfo.Logs.Folder.Local)
 	} else {
 		err = files.RemoveContent(svcInfo.Logs.Folder.Local)
 		if err != nil {

internal/testrunner/runners/asset/runner.go

@@ -46,6 +46,24 @@ func (r runner) String() string {
 	return "asset loading"
 }
 
+// SetupRunner prepares global resources required by the test runner.
+func (r *runner) SetupRunner(ctx context.Context, options testrunner.TestOptions) error {
+	r.packageRootPath = options.PackageRootPath
+	r.kibanaClient = options.KibanaClient
+
+	manager := resources.NewManager()
+	manager.RegisterProvider(resources.DefaultKibanaProviderName, &resources.KibanaProvider{Client: r.kibanaClient})
+
+	r.resourcesManager = manager
+	return nil
+}
+
+// TearDownRunner cleans up any global test runner resources. It must be called
+// after the test runner has finished executing all its tests.
+func (r runner) TearDownRunner(ctx context.Context) error {
+	return nil
+}
+
 // CanRunPerDataStream returns whether this test runner can run on individual
 // data streams within the package.
 func (r runner) CanRunPerDataStream() bool {
@@ -61,13 +79,6 @@ func (r *runner) CanRunSetupTeardownIndependent() bool {
 // Run runs the asset loading tests
 func (r *runner) Run(ctx context.Context, options testrunner.TestOptions) ([]testrunner.TestResult, error) {
 	r.testFolder = options.TestFolder
-	r.packageRootPath = options.PackageRootPath
-	r.kibanaClient = options.KibanaClient
-
-	manager := resources.NewManager()
-	manager.RegisterProvider(resources.DefaultKibanaProviderName, &resources.KibanaProvider{Client: r.kibanaClient})
-	r.resourcesManager = manager
-
 	return r.run(ctx)
 }
 

internal/testrunner/runners/pipeline/runner.go

@@ -71,9 +71,21 @@ func (r *runner) String() string {
 	return "pipeline"
 }
 
+// SetupRunner prepares global resources required by the test runner.
+func (r *runner) SetupRunner(ctx context.Context, options testrunner.TestOptions) error {
+	r.options = options
+	return nil
+}
+
+// TearDownRunner cleans up any global test runner resources. It must be called
+// after the test runner has finished executing all its tests.
+func (r *runner) TearDownRunner(ctx context.Context) error {
+	return nil
+}
+
 // Run runs the pipeline tests defined under the given folder
 func (r *runner) Run(ctx context.Context, options testrunner.TestOptions) ([]testrunner.TestResult, error) {
-	r.options = options
+	r.options.TestFolder = options.TestFolder
 
 	stackConfig, err := stack.LoadConfig(r.options.Profile)
 	if err != nil {

internal/testrunner/runners/static/runner.go

@@ -45,8 +45,20 @@ func (r runner) String() string {
 	return "static files"
 }
 
-func (r runner) Run(ctx context.Context, options testrunner.TestOptions) ([]testrunner.TestResult, error) {
+// SetupRunner prepares global resources required by the test runner.
+func (r *runner) SetupRunner(ctx context.Context, options testrunner.TestOptions) error {
 	r.options = options
+	return nil
+}
+
+// TearDownRunner cleans up any global test runner resources. It must be called
+// after the test runner has finished executing all its tests.
+func (r *runner) TearDownRunner(ctx context.Context) error {
+	return nil
+}
+
+func (r runner) Run(ctx context.Context, options testrunner.TestOptions) ([]testrunner.TestResult, error) {
+	r.options.TestFolder = options.TestFolder
 	return r.run(ctx)
 }