Fix test reproducability in AbstractBuilderTestCase setup

modules/parent-join/src/test/java/org/elasticsearch/join/query/HasChildQueryBuilderTests.java

@@ -88,9 +88,9 @@ protected Collection<Class<? extends Plugin>> getPlugins() {
     }
 
     @Override
-    protected Settings indexSettings() {
+    protected Settings createTestIndexSettings() {
         return Settings.builder()
-            .put(super.indexSettings())
+            .put(super.createTestIndexSettings())
             .put(IndexMetaData.SETTING_VERSION_CREATED, Version.CURRENT)
             .build();
     }

modules/parent-join/src/test/java/org/elasticsearch/join/query/HasParentQueryBuilderTests.java

@@ -73,9 +73,9 @@ protected Collection<Class<? extends Plugin>> getPlugins() {
     }
 
     @Override
-    protected Settings indexSettings() {
+    protected Settings createTestIndexSettings() {
         return Settings.builder()
-            .put(super.indexSettings())
+            .put(super.createTestIndexSettings())
             .put(IndexMetaData.SETTING_VERSION_CREATED, Version.CURRENT)
             .build();
     }

modules/parent-join/src/test/java/org/elasticsearch/join/query/ParentIdQueryBuilderTests.java

@@ -62,9 +62,9 @@ protected Collection<Class<? extends Plugin>> getPlugins() {
     }
 
     @Override
-    protected Settings indexSettings() {
+    protected Settings createTestIndexSettings() {
         return Settings.builder()
-            .put(super.indexSettings())
+            .put(super.createTestIndexSettings())
             .put(IndexMetaData.SETTING_VERSION_CREATED, Version.CURRENT)
             .build();
     }

server/src/test/java/org/elasticsearch/index/query/SimpleQueryStringBuilderTests.java

@@ -233,7 +233,7 @@ public void testFieldsCannotBeSetToNull() {
 
     public void testDefaultFieldParsing() throws IOException {
         assumeTrue("5.x behaves differently, so skip on non-6.x indices",
-                indexVersionCreated.onOrAfter(Version.V_6_0_0_alpha1));
+                indexSettings().getIndexVersionCreated().onOrAfter(Version.V_6_0_0_alpha1));
 
         String query = randomAlphaOfLengthBetween(1, 10).toLowerCase(Locale.ROOT);
         String contentString = "{\n" +

test/framework/src/main/java/org/elasticsearch/test/AbstractBuilderTestCase.java

@@ -124,14 +124,12 @@ public abstract class AbstractBuilderTestCase extends ESTestCase {
         ALIAS_TO_CONCRETE_FIELD_NAME.put(GEO_POINT_ALIAS_FIELD_NAME, GEO_POINT_FIELD_NAME);
     }
 
-    protected static Version indexVersionCreated;
-
     private static ServiceHolder serviceHolder;
     private static ServiceHolder serviceHolderWithNoType;
     private static int queryNameId = 0;
     private static Settings nodeSettings;
     private static Index index;
-    private static Index indexWithNoType;
+    private static long nowInMillis;
 
     protected static Index getIndex() {
         return index;
@@ -152,7 +150,7 @@ public static void beforeClass() {
             .build();
 
         index = new Index(randomAlphaOfLengthBetween(1, 10), randomAlphaOfLength(10));
-        indexWithNoType = new Index(randomAlphaOfLengthBetween(1, 10), randomAlphaOfLength(10));
+        nowInMillis = randomNonNegativeLong();
     }
 
     @Override
@@ -173,15 +171,19 @@ protected static String createUniqueRandomName() {
         return queryName;
     }
 
-    protected Settings indexSettings() {
+    protected Settings createTestIndexSettings() {
         // we have to prefer CURRENT since with the range of versions we support it's rather unlikely to get the current actually.
-        indexVersionCreated = randomBoolean() ? Version.CURRENT
+        Version indexVersionCreated = randomBoolean() ? Version.CURRENT
                 : VersionUtils.randomVersionBetween(random(), Version.V_6_0_0, Version.CURRENT);
         return Settings.builder()
             .put(IndexMetaData.SETTING_VERSION_CREATED, indexVersionCreated)
             .build();
     }
 
+    protected IndexSettings indexSettings() {
+        return serviceHolder.idxSettings;
+    }
+
     protected static String expectedFieldName(String builderFieldName) {
         return ALIAS_TO_CONCRETE_FIELD_NAME.getOrDefault(builderFieldName, builderFieldName);
     }
@@ -196,12 +198,17 @@ public static void afterClass() throws Exception {
 
     @Before
     public void beforeTest() throws IOException {
+        // the two following ranomized parameters are drawn every run, even though we use them in
+        // creating ServiceHolder just once. The other times are necessary so that further random
+        // generation stays the same for all test that is run, otherwise reproducability breaks
+        Settings indexSettings = createTestIndexSettings();
+
         if (serviceHolder == null) {
-            serviceHolder = new ServiceHolder(nodeSettings, indexSettings(), getPlugins(), this, true);
+            serviceHolder = new ServiceHolder(nodeSettings, indexSettings, getPlugins(), nowInMillis, this, true);
         }
         serviceHolder.clientInvocationHandler.delegate = this;
         if (serviceHolderWithNoType == null) {
-            serviceHolderWithNoType = new ServiceHolder(nodeSettings, indexSettings(), getPlugins(), this, false);
+            serviceHolderWithNoType = new ServiceHolder(nodeSettings, indexSettings, getPlugins(), nowInMillis, this, false);
         }
         serviceHolderWithNoType.clientInvocationHandler.delegate = this;
     }
@@ -305,13 +312,15 @@ private static class ServiceHolder implements Closeable {
         private final BitsetFilterCache bitsetFilterCache;
         private final ScriptService scriptService;
         private final Client client;
-        private final long nowInMillis = randomNonNegativeLong();
+        private final long nowInMillis;
 
         ServiceHolder(Settings nodeSettings,
                         Settings indexSettings,
                         Collection<Class<? extends Plugin>> plugins,
+                        long nowInMillis,
                         AbstractBuilderTestCase testCase,
                         boolean registerType) throws IOException {
+            this.nowInMillis = nowInMillis;
             Environment env = InternalSettingsPreparer.prepareEnvironment(nodeSettings);
             PluginsService pluginsService;
             pluginsService = new PluginsService(nodeSettings, null, env.modulesFile(), env.pluginsFile(), plugins);