Skip to content

Commit 5adcc89

Browse files
[8.19](backport #4870) Enable agent container e2e tests (#5280)
* Enable agent container e2e tests (#4870) * Enable agent container e2e tests * Add a retry for integration and e2e tests * Try setting ryuk to priviledged container (cherry picked from commit f30b83d) # Conflicts: # .buildkite/pipeline.yml * Fix merge --------- Co-authored-by: Michel Laterman <[email protected]> Co-authored-by: michel-laterman <[email protected]>
1 parent 746b453 commit 5adcc89

File tree

2 files changed

+15
-2
lines changed

2 files changed

+15
-2
lines changed

.buildkite/pipeline.yml

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -200,15 +200,29 @@ steps:
200200
provider: "gcp"
201201
artifact_paths:
202202
- build/*.xml
203+
plugins:
204+
- *bk_analytics_token_plugin
205+
- *test_collector_plugin
206+
retry:
207+
automatic:
208+
limit: 1
203209

204210
- label: "E2E Test"
205211
key: "e2e-test"
206212
command: ".buildkite/scripts/e2e_test.sh"
213+
env:
214+
TESTCONTAINERS_RYUK_CONTAINER_PRIVILEGED: "true"
207215
agents:
208216
provider: "gcp"
209217
artifact_paths:
210218
- build/*.xml
211219
- build/e2e-coverage.out
220+
plugins:
221+
- *bk_analytics_token_plugin
222+
- *test_collector_plugin
223+
retry:
224+
automatic:
225+
limit: 1
212226

213227
- label: ":junit: Junit annotate"
214228
agents:

testing/e2e/agent_container_test.go

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,6 @@ type AgentContainerSuite struct {
3737
}
3838

3939
func TestAgentContainerSuite(t *testing.T) {
40-
t.Skip("Flakey test suite skipped. See https://github.com/elastic/fleet-server/issues/3909")
4140
suite.Run(t, new(AgentContainerSuite))
4241
}
4342

@@ -90,7 +89,7 @@ func (suite *AgentContainerSuite) TearDownTest() {
9089
// It checks the status API on the fleet-server's external port and that the agent listed in Kibana states "online"
9190
// Tests that enroll another agent explicitly need fleet-server to be online
9291
func (suite *AgentContainerSuite) FleetIsHealthy(bCtx context.Context, endpoint string) {
93-
ctx, cancel := context.WithTimeout(bCtx, time.Minute)
92+
ctx, cancel := context.WithTimeout(bCtx, 4*time.Minute)
9493
defer cancel()
9594
suite.FleetServerStatusOK(ctx, endpoint)
9695

0 commit comments

Comments
 (0)