Skip to content

Commit 4f323b7

Browse files
authored
Re-enable bwc tests after backporting #70094 to 7.x branch. (#70304)
1 parent 1787d7f commit 4f323b7

File tree

3 files changed

+5
-5
lines changed

3 files changed

+5
-5
lines changed

build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -189,9 +189,9 @@ tasks.register("verifyVersions") {
189189
* after the backport of the backcompat code is complete.
190190
*/
191191

192-
boolean bwc_tests_enabled = false
192+
boolean bwc_tests_enabled = true
193193
// place a PR link here when committing bwc changes:
194-
String bwc_tests_disabled_issue = "https://github.com/elastic/elasticsearch/pull/70094"
194+
String bwc_tests_disabled_issue = ""
195195
/*
196196
* FIPS 140-2 behavior was fixed in 7.11.0. Before that there is no way to run elasticsearch in a
197197
* JVM that is properly configured to be in fips mode with BCFIPS. For now we need to disable

server/src/main/java/org/elasticsearch/action/admin/indices/template/delete/DeleteComposableIndexTemplateAction.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ public static class Request extends MasterNodeRequest<Request> {
3838

3939
public Request(StreamInput in) throws IOException {
4040
super(in);
41-
if (in.getVersion().onOrAfter(Version.V_8_0_0)) {
41+
if (in.getVersion().onOrAfter(Version.V_7_13_0)) {
4242
names = in.readStringArray();
4343
} else {
4444
names = new String[] {in.readString()};
@@ -71,7 +71,7 @@ public String[] names() {
7171
@Override
7272
public void writeTo(StreamOutput out) throws IOException {
7373
super.writeTo(out);
74-
if (out.getVersion().onOrAfter(Version.V_8_0_0)) {
74+
if (out.getVersion().onOrAfter(Version.V_7_13_0)) {
7575
out.writeStringArray(names);
7676
} else {
7777
out.writeString(names[0]);

test/framework/src/main/java/org/elasticsearch/test/rest/ESRestTestCase.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -581,7 +581,7 @@ private void wipeCluster() throws Exception {
581581
.collect(Collectors.toList());
582582
// Ideally we would want to check the version of the elected master node and
583583
// send the delete request directly to that node.
584-
if (nodeVersions.stream().allMatch(version -> version.onOrAfter(Version.V_8_0_0))) {
584+
if (nodeVersions.stream().allMatch(version -> version.onOrAfter(Version.V_7_13_0))) {
585585
try {
586586
adminClient().performRequest(new Request("DELETE", "_index_template/" + String.join(",", names)));
587587
} catch (ResponseException e) {

0 commit comments

Comments
 (0)