Skip to content

Conversation

@swiatekm
Copy link
Contributor

@swiatekm swiatekm commented Dec 1, 2025

We have two integration tests which need to cause Elasticsearch to return mapping conflict errors. To achieve this, they intentionally add an incorrect mapping by creating an index template. However, this index template had the same name in both tests, causing them to be flaky. This PR fixes the problem.

Related issues

@swiatekm swiatekm added skip-changelog backport-active-all Automated backport with mergify to all the active branches flaky-test Unstable or unreliable test cases. labels Dec 1, 2025
@swiatekm swiatekm force-pushed the test/fix-flaky-es-sensitive-tests branch from 18ad599 to 134fd07 Compare December 1, 2025 20:09
@swiatekm swiatekm force-pushed the test/fix-flaky-es-sensitive-tests branch from 134fd07 to 5f8b8c7 Compare December 2, 2025 12:04
@elasticmachine
Copy link
Contributor

💚 Build Succeeded

History

cc @swiatekm

@swiatekm swiatekm marked this pull request as ready for review December 2, 2025 13:45
@swiatekm swiatekm requested a review from a team as a code owner December 2, 2025 13:45
@swiatekm swiatekm added the Team:Elastic-Agent-Control-Plane Label for the Agent Control Plane team label Dec 2, 2025
@elasticmachine
Copy link
Contributor

Pinging @elastic/elastic-agent-control-plane (Team:Elastic-Agent-Control-Plane)

@swiatekm swiatekm merged commit cfa14fa into main Dec 2, 2025
23 checks passed
@swiatekm swiatekm deleted the test/fix-flaky-es-sensitive-tests branch December 2, 2025 14:51
@github-actions
Copy link
Contributor

github-actions bot commented Dec 2, 2025

@Mergifyio backport 8.19 9.1 9.2

@mergify
Copy link
Contributor

mergify bot commented Dec 2, 2025

backport 8.19 9.1 9.2

✅ Backports have been created

mergify bot pushed a commit that referenced this pull request Dec 2, 2025
mergify bot pushed a commit that referenced this pull request Dec 2, 2025
mergify bot pushed a commit that referenced this pull request Dec 2, 2025
swiatekm added a commit that referenced this pull request Dec 2, 2025
(cherry picked from commit cfa14fa)

Co-authored-by: Mikołaj Świątek <mail@mikolajswiatek.com>
swiatekm added a commit that referenced this pull request Dec 2, 2025
(cherry picked from commit cfa14fa)

Co-authored-by: Mikołaj Świątek <mail@mikolajswiatek.com>
swiatekm added a commit that referenced this pull request Dec 3, 2025
swiatekm added a commit that referenced this pull request Dec 3, 2025
(cherry picked from commit cfa14fa)

Co-authored-by: Mikołaj Świątek <mail@mikolajswiatek.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

backport-active-all Automated backport with mergify to all the active branches flaky-test Unstable or unreliable test cases. skip-changelog Team:Elastic-Agent-Control-Plane Label for the Agent Control Plane team

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants