Skip to content

Commit 3cc9d99

Browse files
authored
Create Agent policies per each test execution (#1866)
This PR adds a new Agent Policy that will be created and configured per each system test execution independently. Adding this new Agent Policy ensures that data streams are always empty at the beginning of the test and it avoids that two tests write into the same Data Stream.
1 parent 2bb0880 commit 3cc9d99

File tree

5 files changed

+111
-125
lines changed

5 files changed

+111
-125
lines changed

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

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

internal/agentdeployer/agent.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -391,12 +391,12 @@ func (s *dockerComposeDeployedAgent) TearDown(ctx context.Context) error {
391391
defer func() {
392392
// Remove the service logs dir for this agent
393393
if err := os.RemoveAll(s.agentInfo.Logs.Folder.Local); err != nil {
394-
logger.Errorf("could not remove the agent logs (path: %s): %w", s.agentInfo.Logs.Folder.Local, err)
394+
logger.Errorf("could not remove the agent logs (path: %s): %v", s.agentInfo.Logs.Folder.Local, err)
395395
}
396396

397397
// Remove the configuration dir for this agent (e.g. compose scenario files)
398398
if err := os.RemoveAll(s.agentInfo.ConfigDir); err != nil {
399-
logger.Errorf("could not remove the agent configuration directory (path: %s) %w", s.agentInfo.ConfigDir, err)
399+
logger.Errorf("could not remove the agent configuration directory (path: %s) %v", s.agentInfo.ConfigDir, err)
400400
}
401401
}()
402402

internal/servicedeployer/compose.go

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

internal/servicedeployer/custom_agent.go

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

0 commit comments

Comments
 (0)