From 725517eb6ae0a8ab1c27036f949d7e6f2277b0ce Mon Sep 17 00:00:00 2001
From: Lee Hinman <lee@writequit.org>
Date: Wed, 18 Mar 2020 13:29:51 -0600
Subject: [PATCH] Fix feature flag setting for ComponentTemplate APIs

The feature flag was set for *most* of the builds, but there are a couple where it was missing.

Resolves #53708
---
 qa/smoke-test-multinode/build.gradle                      | 8 ++++++++
 .../test/cluster.component_template/10_basic.yml          | 3 ---
 x-pack/qa/core-rest-tests-with-security/build.gradle      | 8 ++++++++
 3 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/qa/smoke-test-multinode/build.gradle b/qa/smoke-test-multinode/build.gradle
index 244b5d1e8af6e..1a2317fbb1667 100644
--- a/qa/smoke-test-multinode/build.gradle
+++ b/qa/smoke-test-multinode/build.gradle
@@ -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'
+  }
+}
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/cluster.component_template/10_basic.yml b/rest-api-spec/src/main/resources/rest-api-spec/test/cluster.component_template/10_basic.yml
index 177678a3da81d..51b1fa1bd6d7d 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/test/cluster.component_template/10_basic.yml
+++ b/rest-api-spec/src/main/resources/rest-api-spec/test/cluster.component_template/10_basic.yml
@@ -1,8 +1,5 @@
 ---
 "Basic CRUD":
-  - skip:
-      version: "all"
-      reason: "AwaitsFix https://github.com/elastic/elasticsearch/issues/53708"
 
   - do:
       cluster.put_component_template:
diff --git a/x-pack/qa/core-rest-tests-with-security/build.gradle b/x-pack/qa/core-rest-tests-with-security/build.gradle
index 4fc4428c8ed6f..139fb7cd2cabe 100644
--- a/x-pack/qa/core-rest-tests-with-security/build.gradle
+++ b/x-pack/qa/core-rest-tests-with-security/build.gradle
@@ -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'
+  }
+}