From f27a0ad4f571026c1dc14bebcae3e5b55d7b5e19 Mon Sep 17 00:00:00 2001
From: "opensearch-trigger-bot[bot]"
 <98922864+opensearch-trigger-bot[bot]@users.noreply.github.com>
Date: Tue, 25 Jun 2024 11:32:57 -0700
Subject: [PATCH] Fix flaky test in range aggregation yaml test (#14486)
 (#14534)

(cherry picked from commit 0d01d1755e282763e5ea020112617ba25459863c)

Signed-off-by: bowenlan-amzn <bowenlan23@gmail.com>
Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
---
 .../rest-api-spec/test/search.aggregation/10_histogram.yml  | 5 +++++
 .../rest-api-spec/test/search.aggregation/230_composite.yml | 6 ++++++
 .../test/search.aggregation/330_auto_date_histogram.yml     | 5 +++++
 .../rest-api-spec/test/search.aggregation/40_range.yml      | 6 ++++++
 4 files changed, 22 insertions(+)

diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/search.aggregation/10_histogram.yml b/rest-api-spec/src/main/resources/rest-api-spec/test/search.aggregation/10_histogram.yml
index c400ff22b62d7..298c5eddc113d 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/test/search.aggregation/10_histogram.yml
+++ b/rest-api-spec/src/main/resources/rest-api-spec/test/search.aggregation/10_histogram.yml
@@ -678,6 +678,11 @@ setup:
           - '{"index": {}}'
           - '{"date": "2016-03-01"}'
 
+  - do:
+      indices.forcemerge:
+        index: test_2
+        max_num_segments: 1
+
   - do:
       search:
         index: test_2
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/search.aggregation/230_composite.yml b/rest-api-spec/src/main/resources/rest-api-spec/test/search.aggregation/230_composite.yml
index e59cb45c7d033..2fd941156cb9f 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/test/search.aggregation/230_composite.yml
+++ b/rest-api-spec/src/main/resources/rest-api-spec/test/search.aggregation/230_composite.yml
@@ -1101,6 +1101,12 @@ setup:
           - '{"date": "2016-02-01"}'
           - '{"index": {}}'
           - '{"date": "2016-03-01"}'
+
+  - do:
+      indices.forcemerge:
+        index: test_2
+        max_num_segments: 1
+
   - do:
       search:
         index: test_2
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/search.aggregation/330_auto_date_histogram.yml b/rest-api-spec/src/main/resources/rest-api-spec/test/search.aggregation/330_auto_date_histogram.yml
index 150f6c14b97d3..c69c3406d2a12 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/test/search.aggregation/330_auto_date_histogram.yml
+++ b/rest-api-spec/src/main/resources/rest-api-spec/test/search.aggregation/330_auto_date_histogram.yml
@@ -133,6 +133,11 @@ setup:
           - '{"index": {}}'
           - '{"date": "2020-03-09", "v": 4}'
 
+  - do:
+      indices.forcemerge:
+        index: test_profile
+        max_num_segments: 1
+
   - do:
       search:
         index: test_profile
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/search.aggregation/40_range.yml b/rest-api-spec/src/main/resources/rest-api-spec/test/search.aggregation/40_range.yml
index 2fd926276d0b4..80aad96ce1f6b 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/test/search.aggregation/40_range.yml
+++ b/rest-api-spec/src/main/resources/rest-api-spec/test/search.aggregation/40_range.yml
@@ -544,6 +544,7 @@ setup:
         body:
           settings:
             number_of_replicas: 0
+            number_of_shards: 1
             refresh_interval: -1
           mappings:
             properties:
@@ -567,6 +568,11 @@ setup:
           - '{"index": {}}'
           - '{"double" : 50}'
 
+  - do:
+      indices.forcemerge:
+        index: test_profile
+        max_num_segments: 1
+
   - do:
       search:
         index: test_profile