honeymoose
/
OpenSearch
mirror of https://github.com/honeymoose/OpenSearch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[TEST] Only wait for 6.6 prerequisites if BWC version is 6.6 or higher (#47289) 

With this change the test setup for ML config upgrade
tests only waits for v6.6+ ML index templates to be
installed if the old cluster is running version 6.6.0
or higher.

Previously it was always waiting, but timing out without
failing the test if the templates were not installed
within 10 seconds, effectively just adding a pointless
10 second sleep to BWC tests against versions earlier
than 6.6.0. This problem was exposed by #47112.

Fixes #47286
This commit is contained in:
David Roberts 2019-09-30 14:55:50 +01:00 committed by GitHub
parent 052c523d41
commit 24b3703005
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
x-pack/qa/full-cluster-restart/src/test/java/org/elasticsearch/xpack/restart/MlConfigIndexMappingsFullClusterRestartIT.java
View File

@ -76,11 +76,12 @@ public class MlConfigIndexMappingsFullClusterRestartIT extends AbstractFullClust
@Before
public void waitForMlTemplates() throws Exception {
List<String> templatesToWaitFor = XPackRestTestConstants.ML_POST_V660_TEMPLATES;
XPackRestTestHelper.waitForTemplates(client(), templatesToWaitFor);
if (getOldClusterVersion().onOrAfter(Version.V_6_6_0)) {
List<String> templatesToWaitFor = XPackRestTestConstants.ML_POST_V660_TEMPLATES;
XPackRestTestHelper.waitForTemplates(client(), templatesToWaitFor);
}
}
@AwaitsFix(bugUrl = "https://github.com/elastic/elasticsearch/issues/47286")
public void testMlConfigIndexMappingsAfterMigration() throws Exception {
assumeTrue("This test only makes sense in version 6.6.0 and above", getOldClusterVersion().onOrAfter(Version.V_6_6_0));
if (isRunningAgainstOldCluster()) {