Skip to content

Commit 40181eb

Browse files
authored
[7.x] Fix feature flag setting for ComponentTemplate APIs (#53… (#53800)
* Fix feature flag setting for ComponentTemplate APIs (#53758) The feature flag was set for *most* of the builds, but there are a couple where it was missing. Resolves #53708 * Add skip for older versions of ES
1 parent 7d3ac4f commit 40181eb

File tree

3 files changed

+18
-2
lines changed

3 files changed

+18
-2
lines changed

qa/smoke-test-multinode/build.gradle

+8
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,8 @@
1717
* under the License.
1818
*/
1919

20+
import org.elasticsearch.gradle.info.BuildParams
21+
2022
apply plugin: 'elasticsearch.testclusters'
2123
apply plugin: 'elasticsearch.standalone-rest-test'
2224
apply plugin: 'elasticsearch.rest-test'
@@ -46,3 +48,9 @@ integTest.runner {
4648
].join(',')
4749
}
4850
}
51+
52+
testClusters.integTest {
53+
if (BuildParams.isSnapshotBuild() == false) {
54+
systemProperty 'es.itv2_feature_flag_registered', 'true'
55+
}
56+
}

rest-api-spec/src/main/resources/rest-api-spec/test/cluster.component_template/10_basic.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
---
22
"Basic CRUD":
33
- skip:
4-
version: " - 7.99.99"
5-
reason: not backported yet
4+
version: " - 7.6.99"
5+
reason: only available in 7.7+
66

77
- do:
88
cluster.put_component_template:

x-pack/qa/core-rest-tests-with-security/build.gradle

+8
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
import org.elasticsearch.gradle.info.BuildParams
2+
13
apply plugin: 'elasticsearch.testclusters'
24
apply plugin: 'elasticsearch.standalone-rest-test'
35
apply plugin: 'elasticsearch.rest-test'
@@ -37,3 +39,9 @@ testClusters.integTest {
3739
user username: System.getProperty('tests.rest.cluster.username', 'test_user'),
3840
password: System.getProperty('tests.rest.cluster.password', 'x-pack-test-password')
3941
}
42+
43+
testClusters.integTest {
44+
if (BuildParams.isSnapshotBuild() == false) {
45+
systemProperty 'es.itv2_feature_flag_registered', 'true'
46+
}
47+
}

0 commit comments

Comments
 (0)