|
10 | 10 | import org.apache.http.entity.ContentType; |
11 | 11 | import org.apache.http.entity.StringEntity; |
12 | 12 | import org.elasticsearch.Build; |
| 13 | +import org.elasticsearch.Version; |
13 | 14 | import org.elasticsearch.client.Request; |
14 | 15 | import org.elasticsearch.client.Response; |
15 | 16 | import org.elasticsearch.client.RestClient; |
@@ -235,13 +236,14 @@ private void verifyContinuousTransformHandlesData(long expectedLastCheckpoint) t |
235 | 236 | private void verifyUpgradeFailsIfMixedCluster() { |
236 | 237 | // upgrade tests by design are also executed with the same version, this check must be skipped in this case, see gh#39102. |
237 | 238 | if (isOriginalClusterCurrent()) { |
238 | | - Build.current().v |
239 | 239 | return; |
240 | 240 | } |
241 | | - final Request upgradeTransformRequest = new Request("POST", getTransformEndpoint() + "_upgrade"); |
242 | | - |
243 | | - Exception ex = expectThrows(Exception.class, () -> client().performRequest(upgradeTransformRequest)); |
244 | | - assertThat(ex.getMessage(), containsString("Cannot upgrade transforms while cluster upgrade is in progress")); |
| 241 | + var oldestVersion = Version.fromString(UPGRADE_FROM_VERSION); |
| 242 | + if (oldestVersion.onOrAfter(Version.V_9_2_0)) { |
| 243 | + final Request upgradeTransformRequest = new Request("POST", getTransformEndpoint() + "_upgrade"); |
| 244 | + Exception ex = expectThrows(Exception.class, () -> client().performRequest(upgradeTransformRequest)); |
| 245 | + assertThat(ex.getMessage(), containsString("Cannot upgrade transforms while cluster upgrade is in progress")); |
| 246 | + } |
245 | 247 | } |
246 | 248 |
|
247 | 249 | private void verifyUpgrade() throws IOException { |
|
0 commit comments