Add support for switching distribution for all integration tests (#30874)

alpar-t · web-flow · commit 08b8d11e303e · 2018-06-26T06:49:03.000-07:00
* remove left-over comment

* make sure of the property for plugins

* skip installing modules if these exist in the distribution

* Log the distrbution being ran

* Don't allow running with integ-tests-zip passed externally

* top level x-pack/qa can't run with oss distro

* Add support for matching objects in lists

Makes it possible to have a key that points to a list and assert that a
certain object is present in the list. All keys have to be present and
values have to match. The objects in the source list may have additional
fields.

example:
```
  match:  { 'nodes.$master.plugins': { name: ingest-attachment }  }
```

* Update plugin and module tests to work with other distributions

Some of the tests expected that the integration tests will always be ran
with  the `integ-test-zip` distribution so that there will be no other
plugins loaded.

With this change, we check for the presence of the plugin without
assuming exclusivity.

* Allow modules to run on other distros as well

To match the behavior of tets.distributions

* Add and use a new `contains` assertion

Replaces the  previus changes that caused `match` to do a partial match.

* Implement PR review comments
diff --git a/buildSrc/src/main/groovy/org/elasticsearch/gradle/plugin/PluginBuildPlugin.groovy b/buildSrc/src/main/groovy/org/elasticsearch/gradle/plugin/PluginBuildPlugin.groovy
@@ -71,7 +71,9 @@ public class PluginBuildPlugin extends BuildPlugin {
             if (isModule) {
                 project.integTestCluster.module(project)
                 project.tasks.run.clusterConfig.module(project)
-                project.tasks.run.clusterConfig.distribution = 'integ-test-zip'
+                project.tasks.run.clusterConfig.distribution = System.getProperty(
+                        'run.distribution', 'integ-test-zip'
+                )
             } else {
                 project.integTestCluster.plugin(project.path)
                 project.tasks.run.clusterConfig.plugin(project.path)
@@ -111,7 +113,7 @@ public class PluginBuildPlugin extends BuildPlugin {
     private static void createIntegTestTask(Project project) {
         RestIntegTestTask integTest = project.tasks.create('integTest', RestIntegTestTask.class)
         integTest.mustRunAfter(project.precommit, project.test)
-        project.integTestCluster.distribution = 'integ-test-zip'
+        project.integTestCluster.distribution = System.getProperty('tests.distribution', 'integ-test-zip')
         project.check.dependsOn(integTest)
     }
 
diff --git a/buildSrc/src/main/groovy/org/elasticsearch/gradle/test/ClusterFormationTasks.groovy b/buildSrc/src/main/groovy/org/elasticsearch/gradle/test/ClusterFormationTasks.groovy
@@ -88,6 +88,9 @@ class ClusterFormationTasks {
         Configuration currentDistro = project.configurations.create("${prefix}_elasticsearchDistro")
         Configuration bwcDistro = project.configurations.create("${prefix}_elasticsearchBwcDistro")
         Configuration bwcPlugins = project.configurations.create("${prefix}_elasticsearchBwcPlugins")
+        if (System.getProperty('tests.distribution', 'oss-zip') == 'integ-test-zip') {
+            throw new Exception("tests.distribution=integ-test-zip is not supported")
+        }
         configureDistributionDependency(project, config.distribution, currentDistro, VersionProperties.elasticsearch)
         if (config.numBwcNodes > 0) {
             if (config.bwcVersion == null) {
@@ -533,7 +536,8 @@ class ClusterFormationTasks {
 
     static Task configureInstallModuleTask(String name, Project project, Task setup, NodeInfo node, Project module) {
         if (node.config.distribution != 'integ-test-zip') {
-            throw new GradleException("Module ${module.path} not allowed be installed distributions other than integ-test-zip because they should already have all modules bundled!")
+            project.logger.lifecycle("Not installing modules for $name, ${node.config.distribution} already has them")
+            return setup
         }
         if (module.plugins.hasPlugin(PluginBuildPlugin) == false) {
             throw new GradleException("Task ${name} cannot include module ${module.path} which is not an esplugin")
@@ -643,6 +647,9 @@ class ClusterFormationTasks {
             BuildPlugin.requireJavaHome(start, node.javaVersion)
         }
         start.doLast(elasticsearchRunner)
+        start.doFirst {
+            project.logger.info("Starting node in ${node.clusterName} distribution: ${node.config.distribution}")
+        }
         return start
     }
 
diff --git a/modules/aggs-matrix-stats/src/test/resources/rest-api-spec/test/stats/10_basic.yml b/modules/aggs-matrix-stats/src/test/resources/rest-api-spec/test/stats/10_basic.yml
@@ -10,4 +10,4 @@
     - do:
         nodes.info: {}
 
-    - match:  { nodes.$master.modules.0.name: aggs-matrix-stats }
+    - contains:  { nodes.$master.modules: { name: aggs-matrix-stats } }
diff --git a/modules/analysis-common/src/test/resources/rest-api-spec/test/analysis-common/10_basic.yml b/modules/analysis-common/src/test/resources/rest-api-spec/test/analysis-common/10_basic.yml
@@ -8,4 +8,4 @@
     - do:
         nodes.info: {}
 
-    - match:  { nodes.$master.modules.0.name: analysis-common }
+    - contains:  { nodes.$master.modules: { name: analysis-common } }
diff --git a/modules/ingest-common/src/test/resources/rest-api-spec/test/ingest/10_basic.yml b/modules/ingest-common/src/test/resources/rest-api-spec/test/ingest/10_basic.yml
@@ -8,25 +8,25 @@
     - do:
         nodes.info: {}
 
-    - match:  { nodes.$master.modules.0.name: ingest-common  }
-    - match:  { nodes.$master.ingest.processors.0.type: append }
-    - match:  { nodes.$master.ingest.processors.1.type: convert }
-    - match:  { nodes.$master.ingest.processors.2.type: date }
-    - match:  { nodes.$master.ingest.processors.3.type: date_index_name }
-    - match:  { nodes.$master.ingest.processors.4.type: dot_expander }
-    - match:  { nodes.$master.ingest.processors.5.type: fail }
-    - match:  { nodes.$master.ingest.processors.6.type: foreach }
-    - match:  { nodes.$master.ingest.processors.7.type: grok }
-    - match:  { nodes.$master.ingest.processors.8.type: gsub }
-    - match:  { nodes.$master.ingest.processors.9.type: join }
-    - match:  { nodes.$master.ingest.processors.10.type: json }
-    - match:  { nodes.$master.ingest.processors.11.type: kv }
-    - match:  { nodes.$master.ingest.processors.12.type: lowercase }
-    - match:  { nodes.$master.ingest.processors.13.type: remove }
-    - match:  { nodes.$master.ingest.processors.14.type: rename }
-    - match:  { nodes.$master.ingest.processors.15.type: script }
-    - match:  { nodes.$master.ingest.processors.16.type: set }
-    - match:  { nodes.$master.ingest.processors.17.type: sort }
-    - match:  { nodes.$master.ingest.processors.18.type: split }
-    - match:  { nodes.$master.ingest.processors.19.type: trim }
-    - match:  { nodes.$master.ingest.processors.20.type: uppercase }
+    - contains:  { nodes.$master.modules: { name: ingest-common } }
+    - contains:  { nodes.$master.ingest.processors: { type: append } }
+    - contains:  { nodes.$master.ingest.processors: { type: convert } }
+    - contains:  { nodes.$master.ingest.processors: { type: date } }
+    - contains:  { nodes.$master.ingest.processors: { type: date_index_name } }
+    - contains:  { nodes.$master.ingest.processors: { type: dot_expander } }
+    - contains:  { nodes.$master.ingest.processors: { type: fail } }
+    - contains:  { nodes.$master.ingest.processors: { type: foreach } }
+    - contains:  { nodes.$master.ingest.processors: { type: grok } }
+    - contains:  { nodes.$master.ingest.processors: { type: gsub } }
+    - contains:  { nodes.$master.ingest.processors: { type: join } }
+    - contains:  { nodes.$master.ingest.processors: { type: json } }
+    - contains:  { nodes.$master.ingest.processors: { type: kv } }
+    - contains:  { nodes.$master.ingest.processors: { type: lowercase } }
+    - contains:  { nodes.$master.ingest.processors: { type: remove } }
+    - contains:  { nodes.$master.ingest.processors: { type: rename } }
+    - contains:  { nodes.$master.ingest.processors: { type: script } }
+    - contains:  { nodes.$master.ingest.processors: { type: set } }
+    - contains:  { nodes.$master.ingest.processors: { type: sort } }
+    - contains:  { nodes.$master.ingest.processors: { type: split } }
+    - contains:  { nodes.$master.ingest.processors: { type: trim } }
+    - contains:  { nodes.$master.ingest.processors: { type: uppercase } }
diff --git a/modules/lang-expression/src/test/resources/rest-api-spec/test/lang_expression/10_basic.yml b/modules/lang-expression/src/test/resources/rest-api-spec/test/lang_expression/10_basic.yml
@@ -10,4 +10,4 @@
     - do:
         nodes.info: {}
 
-    - match:  { nodes.$master.modules.0.name: lang-expression  }
+    - contains:  { nodes.$master.modules: { name: lang-expression  } }
diff --git a/modules/lang-mustache/src/test/resources/rest-api-spec/test/lang_mustache/10_basic.yml b/modules/lang-mustache/src/test/resources/rest-api-spec/test/lang_mustache/10_basic.yml
@@ -10,4 +10,4 @@
     - do:
         nodes.info: {}
 
-    - match:  { nodes.$master.modules.0.name: lang-mustache  }
+    - contains:  { nodes.$master.modules: { name: lang-mustache } }
diff --git a/modules/lang-painless/src/test/resources/rest-api-spec/test/painless/10_basic.yml b/modules/lang-painless/src/test/resources/rest-api-spec/test/painless/10_basic.yml
@@ -10,4 +10,4 @@
     - do:
         nodes.info: {}
 
-    - match:  { nodes.$master.modules.0.name: lang-painless }
+    - contains:  { nodes.$master.modules: { name: lang-painless } }
diff --git a/modules/repository-url/src/test/resources/rest-api-spec/test/repository_url/10_basic.yml b/modules/repository-url/src/test/resources/rest-api-spec/test/repository_url/10_basic.yml
@@ -112,7 +112,7 @@ teardown:
     - do:
         nodes.info: {}
 
-    - match: { nodes.$master.modules.0.name: repository-url }
+    - contains: { nodes.$master.modules: { name: repository-url } }
 
 ---
 "Restore with repository-url using http://":
diff --git a/modules/transport-netty4/src/test/resources/rest-api-spec/test/10_basic.yml b/modules/transport-netty4/src/test/resources/rest-api-spec/test/10_basic.yml
@@ -10,7 +10,7 @@
     - do:
         nodes.info: {}
 
-    - match:  { nodes.$master.modules.0.name: transport-netty4  }
+    - contains:  { nodes.$master.modules: { name: transport-netty4  } }
 
     - do:
         cluster.stats: {}
diff --git a/plugins/discovery-azure-classic/src/test/resources/rest-api-spec/test/discovery_azure_classic/10_basic.yml b/plugins/discovery-azure-classic/src/test/resources/rest-api-spec/test/discovery_azure_classic/10_basic.yml
@@ -10,4 +10,4 @@
     - do:
         nodes.info: {}
 
-    - match:  { nodes.$master.plugins.0.name: discovery-azure-classic  }
+    - contains:  { nodes.$master.plugins: { name: discovery-azure-classic } }
diff --git a/plugins/discovery-ec2/src/test/resources/rest-api-spec/test/discovery_ec2/10_basic.yml b/plugins/discovery-ec2/src/test/resources/rest-api-spec/test/discovery_ec2/10_basic.yml
@@ -10,4 +10,4 @@
     - do:
         nodes.info: {}
 
-    - match:  { nodes.$master.plugins.0.name: discovery-ec2  }
+    - contains:  { nodes.$master.plugins: { name: discovery-ec2 } }
diff --git a/plugins/discovery-file/build.gradle b/plugins/discovery-file/build.gradle
@@ -38,7 +38,7 @@ task setupSeedNodeAndUnicastHostsFile(type: DefaultTask) {
 // setup the initial cluster with one node that will serve as the seed node
 // for unicast discovery
 ClusterConfiguration config = new ClusterConfiguration(project)
-config.distribution = 'integ-test-zip'
+config.distribution = System.getProperty('tests.distribution', 'integ-test-zip')
 config.clusterName = 'discovery-file-test-cluster'
 List<NodeInfo> nodes = ClusterFormationTasks.setup(project, 'initialCluster', setupSeedNodeAndUnicastHostsFile, config)
 File srcUnicastHostsFile = file('build/cluster/unicast_hosts.txt')
diff --git a/plugins/discovery-gce/src/test/resources/rest-api-spec/test/discovery_gce/10_basic.yml b/plugins/discovery-gce/src/test/resources/rest-api-spec/test/discovery_gce/10_basic.yml
@@ -10,4 +10,4 @@
     - do:
         nodes.info: {}
 
-    - match:  { nodes.$master.plugins.0.name: discovery-gce  }
+    - contains:  { nodes.$master.plugins: { name: discovery-gce } }
diff --git a/plugins/examples/painless-whitelist/build.gradle b/plugins/examples/painless-whitelist/build.gradle
@@ -30,8 +30,8 @@ dependencies {
   compileOnly project(':modules:lang-painless')
 }
 
-integTestCluster {
-  distribution = 'zip'
+if (System.getProperty('tests.distribution') == null) {
+  integTestCluster.distribution = 'oss-zip'
 }
 
 test.enabled = false
diff --git a/plugins/examples/painless-whitelist/src/test/resources/rest-api-spec/test/painless_whitelist/10_basic.yml b/plugins/examples/painless-whitelist/src/test/resources/rest-api-spec/test/painless_whitelist/10_basic.yml
@@ -10,4 +10,4 @@
     - do:
         nodes.info: {}
 
-    - match:  { nodes.$master.plugins.0.name: painless-whitelist  }
+    - contains:  { nodes.$master.plugins: { name: painless-whitelist } }
diff --git a/plugins/examples/rescore/src/test/resources/rest-api-spec/test/example-rescore/10_basic.yml b/plugins/examples/rescore/src/test/resources/rest-api-spec/test/example-rescore/10_basic.yml
@@ -10,4 +10,4 @@
     - do:
         nodes.info: {}
 
-    - match:  { nodes.$master.plugins.0.name: example-rescore  }
+    - contains:  { nodes.$master.plugins: { name: example-rescore } }
diff --git a/plugins/examples/script-expert-scoring/src/test/resources/rest-api-spec/test/script_expert_scoring/10_basic.yml b/plugins/examples/script-expert-scoring/src/test/resources/rest-api-spec/test/script_expert_scoring/10_basic.yml
@@ -10,4 +10,4 @@
     - do:
         nodes.info: {}
 
-    - match:  { nodes.$master.plugins.0.name: script-expert-scoring  }
+    - contains:  { nodes.$master.plugins: { name: script-expert-scoring } }
diff --git a/plugins/ingest-attachment/src/test/resources/rest-api-spec/test/ingest_attachment/10_basic.yml b/plugins/ingest-attachment/src/test/resources/rest-api-spec/test/ingest_attachment/10_basic.yml
@@ -7,6 +7,6 @@
     - do:
         nodes.info: {}
 
-    - match:  { nodes.$master.plugins.0.name: ingest-attachment  }
-    - match:  { nodes.$master.ingest.processors.0.type: attachment }
+    - contains:  { 'nodes.$master.plugins': { name: ingest-attachment }  }
+    - contains:  { 'nodes.$master.ingest.processors': { type: attachment } }
 
diff --git a/plugins/ingest-geoip/src/test/resources/rest-api-spec/test/ingest_geoip/10_basic.yml b/plugins/ingest-geoip/src/test/resources/rest-api-spec/test/ingest_geoip/10_basic.yml
@@ -7,5 +7,5 @@
     - do:
         nodes.info: {}
 
-    - match:  { nodes.$master.plugins.0.name: ingest-geoip  }
-    - match:  { nodes.$master.ingest.processors.0.type: geoip }
+    - contains:  { nodes.$master.plugins: { name: ingest-geoip } }
+    - contains:  { nodes.$master.ingest.processors: { type: geoip } }
diff --git a/plugins/ingest-user-agent/src/test/resources/rest-api-spec/test/ingest-useragent/10_basic.yml b/plugins/ingest-user-agent/src/test/resources/rest-api-spec/test/ingest-useragent/10_basic.yml
@@ -7,5 +7,5 @@
     - do:
         nodes.info: {}
 
-    - match:  { nodes.$master.plugins.0.name: ingest-user-agent }
-    - match:  { nodes.$master.ingest.processors.0.type: user_agent }
+    - contains:  { nodes.$master.plugins: { name: ingest-user-agent } }
+    - contains:  { nodes.$master.ingest.processors: { type: user_agent } }
diff --git a/plugins/repository-azure/src/test/resources/rest-api-spec/test/repository_azure/10_basic.yml b/plugins/repository-azure/src/test/resources/rest-api-spec/test/repository_azure/10_basic.yml
@@ -10,4 +10,4 @@
     - do:
         nodes.info: {}
 
-    - match:  { nodes.$master.plugins.0.name: repository-azure  }
+    - contains:  { nodes.$master.plugins: { name: repository-azure } }
diff --git a/plugins/repository-gcs/src/test/resources/rest-api-spec/test/repository_gcs/10_basic.yml b/plugins/repository-gcs/src/test/resources/rest-api-spec/test/repository_gcs/10_basic.yml
@@ -10,4 +10,4 @@
     - do:
         nodes.info: {}
 
-    - match:  { nodes.$master.plugins.0.name: repository-gcs  }
+    - contains:  { nodes.$master.plugins: { name: repository-gcs } }
diff --git a/plugins/repository-hdfs/build.gradle b/plugins/repository-hdfs/build.gradle
@@ -158,7 +158,6 @@ for (String fixtureName : ['hdfsFixture', 'haHdfsFixture', 'secureHdfsFixture',
 project.afterEvaluate {
   for (String integTestTaskName : ['integTestHa', 'integTestSecure', 'integTestSecureHa']) {
     ClusterConfiguration cluster = project.extensions.getByName("${integTestTaskName}Cluster") as ClusterConfiguration
-    cluster.distribution = 'integ-test-zip'
     cluster.dependsOn(project.bundlePlugin)
 
     Task restIntegTestTask = project.tasks.getByName(integTestTaskName)
diff --git a/plugins/repository-hdfs/src/test/resources/rest-api-spec/test/hdfs_repository/10_basic.yml b/plugins/repository-hdfs/src/test/resources/rest-api-spec/test/hdfs_repository/10_basic.yml
@@ -12,7 +12,7 @@
     - do:
         nodes.info: {}
 
-    - match:  { nodes.$master.plugins.0.name: repository-hdfs  }
+    - contains:  { nodes.$master.plugins: { name: repository-hdfs } }
 ---
 #
 # Check that we can't use file:// repositories or anything like that
diff --git a/plugins/repository-hdfs/src/test/resources/rest-api-spec/test/secure_hdfs_repository/10_basic.yml b/plugins/repository-hdfs/src/test/resources/rest-api-spec/test/secure_hdfs_repository/10_basic.yml
@@ -12,7 +12,7 @@
     - do:
         nodes.info: {}
 
-    - match:  { nodes.$master.plugins.0.name: repository-hdfs  }
+    - contains:  { nodes.$master.plugins: { name: repository-hdfs } }
 ---
 #
 # Check that we can't use file:// repositories or anything like that
diff --git a/plugins/repository-s3/src/test/resources/rest-api-spec/test/repository_s3/10_basic.yml b/plugins/repository-s3/src/test/resources/rest-api-spec/test/repository_s3/10_basic.yml
@@ -10,4 +10,4 @@
     - do:
         nodes.info: {}
 
-    - match:  { nodes.$master.plugins.0.name: repository-s3  }
+    - contains:  { nodes.$master.plugins: { name: repository-s3 } }
diff --git a/plugins/store-smb/src/test/resources/rest-api-spec/test/store_smb/10_basic.yml b/plugins/store-smb/src/test/resources/rest-api-spec/test/store_smb/10_basic.yml
@@ -10,4 +10,4 @@
     - do:
         nodes.info: {}
 
-    - match:  { nodes.$master.plugins.0.name: store-smb  }
+    - contains:  { nodes.$master.plugins: { name: store-smb } }
diff --git a/test/framework/src/main/java/org/elasticsearch/test/rest/yaml/section/ContainsAssertion.java b/test/framework/src/main/java/org/elasticsearch/test/rest/yaml/section/ContainsAssertion.java
@@ -0,0 +1,80 @@
+/*
+ * Licensed to Elasticsearch under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.elasticsearch.test.rest.yaml.section;
+
+import org.apache.logging.log4j.Logger;
+import org.elasticsearch.common.collect.Tuple;
+import org.elasticsearch.common.logging.Loggers;
+import org.elasticsearch.common.xcontent.XContentLocation;
+import org.elasticsearch.common.xcontent.XContentParser;
+
+import java.io.IOException;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+import static org.hamcrest.Matchers.empty;
+import static org.hamcrest.Matchers.is;
+import static org.hamcrest.Matchers.not;
+import static org.junit.Assert.assertThat;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+
+public class ContainsAssertion extends Assertion {
+    public static ContainsAssertion parse(XContentParser parser) throws IOException {
+        XContentLocation location = parser.getTokenLocation();
+        Tuple<String,Object> stringObjectTuple = ParserUtils.parseTuple(parser);
+        return new ContainsAssertion(location, stringObjectTuple.v1(), stringObjectTuple.v2());
+    }
+
+    private static final Logger logger = Loggers.getLogger(ContainsAssertion.class);
+
+    public ContainsAssertion(XContentLocation location, String field, Object expectedValue) {
+        super(location, field, expectedValue);
+    }
+
+    @Override
+    protected void doAssert(Object actualValue, Object expectedValue) {
+        // add support for matching objects ({a:b}) against list of objects ([ {a:b, c:d} ])
+        if(expectedValue instanceof Map && actualValue instanceof List) {
+            logger.trace("assert that [{}] contains [{}]", actualValue, expectedValue);
+            Map<String, Object> expectedMap = (Map<String, Object>) expectedValue;
+            List<Object> actualList = (List<Object>) actualValue;
+            List<Map<String, Object>> actualValues = actualList.stream()
+                .filter(each -> each instanceof Map)
+                .map((each -> (Map<String, Object>) each))
+                .filter(each -> each.keySet().containsAll(expectedMap.keySet()))
+                .collect(Collectors.toList());
+            assertThat(
+                getField() + " expected to be a list with at least one object that has keys: " +
+                    expectedMap.keySet() + " but it was " + actualList,
+                actualValues,
+                is(not(empty()))
+            );
+            assertTrue(
+                getField() + " expected to be a list with at least on object that matches " + expectedMap +
+                    " but was " + actualValues,
+                actualValues.stream()
+                    .anyMatch(each -> each.entrySet().containsAll(expectedMap.entrySet()))
+            );
+        } else {
+            fail("'contains' only supports checking an object against a list of objects");
+        }
+    }
+}
diff --git a/test/framework/src/main/java/org/elasticsearch/test/rest/yaml/section/ExecutableSection.java b/test/framework/src/main/java/org/elasticsearch/test/rest/yaml/section/ExecutableSection.java
@@ -47,6 +47,7 @@ public interface ExecutableSection {
             new NamedXContentRegistry.Entry(ExecutableSection.class, new ParseField("gte"), GreaterThanEqualToAssertion::parse),
             new NamedXContentRegistry.Entry(ExecutableSection.class, new ParseField("lt"), LessThanAssertion::parse),
             new NamedXContentRegistry.Entry(ExecutableSection.class, new ParseField("lte"), LessThanOrEqualToAssertion::parse),
+            new NamedXContentRegistry.Entry(ExecutableSection.class, new ParseField("contains"), ContainsAssertion::parse),
             new NamedXContentRegistry.Entry(ExecutableSection.class, new ParseField("length"), LengthAssertion::parse)));
 
     /**
diff --git a/test/framework/src/test/java/org/elasticsearch/test/rest/yaml/section/AssertionTests.java b/test/framework/src/test/java/org/elasticsearch/test/rest/yaml/section/AssertionTests.java
@@ -134,6 +134,22 @@ public void testParseMatchArray() throws Exception {
         assertThat(strings.get(1).toString(), equalTo("test_percolator_2"));
     }
 
+    @SuppressWarnings("unchecked")
+    public void testParseContains() throws Exception {
+        parser = createParser(YamlXContent.yamlXContent,
+            "{testKey: { someKey: someValue } }"
+        );
+
+        ContainsAssertion containsAssertion = ContainsAssertion.parse(parser);
+        assertThat(containsAssertion, notNullValue());
+        assertThat(containsAssertion.getField(), equalTo("testKey"));
+        assertThat(containsAssertion.getExpectedValue(), instanceOf(Map.class));
+        assertThat(
+            ((Map<String, String>) containsAssertion.getExpectedValue()).get("someKey"),
+            equalTo("someValue")
+        );
+    }
+
     @SuppressWarnings("unchecked")
     public void testParseMatchSourceValues() throws Exception {
         parser = createParser(YamlXContent.yamlXContent,
diff --git a/x-pack/plugin/build.gradle b/x-pack/plugin/build.gradle
@@ -192,3 +192,7 @@ integTestCluster {
       return tmpFile.exists()
   }
 }
+if (integTestCluster.distribution.startsWith("oss-") == false) {
+  integTest.enabled = false
+}
+
diff --git a/x-pack/plugin/src/test/resources/rest-api-spec/test/xpack/10_basic.yml b/x-pack/plugin/src/test/resources/rest-api-spec/test/xpack/10_basic.yml
