From d65ff17b7edbed50e947e863d981a850de0736da Mon Sep 17 00:00:00 2001 From: Jason Tedor Date: Wed, 12 Sep 2018 17:05:00 -0400 Subject: [PATCH] Adjust BWC version on settings upgrade test (#33650) The skip_unavailable setting did not exist until 6.1.0. This means that we need to skip this test on versions prior to 6.1.0. We need to use this setting because otherwise we will fail startup without it (since we are not setting up a real remote cluster connection). This commit adds a skip for all versions prior to 6.1.0. --- .../upgrades/FullClusterRestartSettingsUpgradeIT.java | 1 + 1 file changed, 1 insertion(+) diff --git a/qa/full-cluster-restart/src/test/java/org/elasticsearch/upgrades/FullClusterRestartSettingsUpgradeIT.java b/qa/full-cluster-restart/src/test/java/org/elasticsearch/upgrades/FullClusterRestartSettingsUpgradeIT.java index 5e3ccc75b74d4..99afdce59c59c 100644 --- a/qa/full-cluster-restart/src/test/java/org/elasticsearch/upgrades/FullClusterRestartSettingsUpgradeIT.java +++ b/qa/full-cluster-restart/src/test/java/org/elasticsearch/upgrades/FullClusterRestartSettingsUpgradeIT.java @@ -44,6 +44,7 @@ public class FullClusterRestartSettingsUpgradeIT extends AbstractFullClusterRestartTestCase { public void testRemoteClusterSettingsUpgraded() throws IOException { + assumeTrue("skip_unavailable did not exist until 6.1.0", getOldClusterVersion().onOrAfter(Version.V_6_1_0)); assumeTrue("settings automatically upgraded since 6.5.0", getOldClusterVersion().before(Version.V_6_5_0)); if (isRunningAgainstOldCluster()) { final Request putSettingsRequest = new Request("PUT", "/_cluster/settings");