[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
This commit is contained in:
Lee Hinman 2020-03-19 09:35:07 -06:00 committed by GitHub
parent 7d3ac4f57d
commit 40181eb200
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 18 additions and 2 deletions

View File

@ -17,6 +17,8 @@
* under the License.
*/
import org.elasticsearch.gradle.info.BuildParams
apply plugin: 'elasticsearch.testclusters'
apply plugin: 'elasticsearch.standalone-rest-test'
apply plugin: 'elasticsearch.rest-test'
@ -46,3 +48,9 @@ integTest.runner {
].join(',')
}
}
testClusters.integTest {
if (BuildParams.isSnapshotBuild() == false) {
systemProperty 'es.itv2_feature_flag_registered', 'true'
}
}

View File

@ -1,8 +1,8 @@
---
"Basic CRUD":
- skip:
version: " - 7.99.99"
reason: not backported yet
version: " - 7.6.99"
reason: only available in 7.7+
- do:
cluster.put_component_template:

View File

@ -1,3 +1,5 @@
import org.elasticsearch.gradle.info.BuildParams
apply plugin: 'elasticsearch.testclusters'
apply plugin: 'elasticsearch.standalone-rest-test'
apply plugin: 'elasticsearch.rest-test'
@ -37,3 +39,9 @@ testClusters.integTest {
user username: System.getProperty('tests.rest.cluster.username', 'test_user'),
password: System.getProperty('tests.rest.cluster.password', 'x-pack-test-password')
}
testClusters.integTest {
if (BuildParams.isSnapshotBuild() == false) {
systemProperty 'es.itv2_feature_flag_registered', 'true'
}
}