Merge branch 'MC-20536' of github.com:magento-arcticfoxes/magento2ce into MC-19451

Author: omiroshnichenko

app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdvanceCatalogSearchConfigurableTest.xml

@@ -80,6 +80,8 @@
         <after>
             <deleteData createDataKey="simple1Handle" stepKey="deleteSimple1" before="deleteSimple2"/>
             <deleteData createDataKey="simple2Handle" stepKey="deleteSimple2" before="delete"/>
+            <deleteData createDataKey="childProductHandle1" stepKey="deleteChildProduct1" before="delete"/>
+            <deleteData createDataKey="childProductHandle2" stepKey="deleteChildProduct2" before="delete"/>
         </after>
     </test>
     <test name="AdvanceCatalogSearchConfigurableBySkuTest" extends="AdvanceCatalogSearchSimpleProductBySkuTest">
@@ -154,6 +156,8 @@
         <after>
             <deleteData createDataKey="simple1Handle" stepKey="deleteSimple1" before="deleteSimple2"/>
             <deleteData createDataKey="simple2Handle" stepKey="deleteSimple2" before="delete"/>
+            <deleteData createDataKey="childProductHandle1" stepKey="deleteChildProduct1" before="delete"/>
+            <deleteData createDataKey="childProductHandle2" stepKey="deleteChildProduct2" before="delete"/>
         </after>
     </test>
     <test name="AdvanceCatalogSearchConfigurableByDescriptionTest" extends="AdvanceCatalogSearchSimpleProductByDescriptionTest">
@@ -228,6 +232,8 @@
         <after>
             <deleteData createDataKey="simple1Handle" stepKey="deleteSimple1" before="deleteSimple2"/>
             <deleteData createDataKey="simple2Handle" stepKey="deleteSimple2" before="delete"/>
+            <deleteData createDataKey="childProductHandle1" stepKey="deleteChildProduct1" before="delete"/>
+            <deleteData createDataKey="childProductHandle2" stepKey="deleteChildProduct2" before="delete"/>
         </after>
     </test>
     <test name="AdvanceCatalogSearchConfigurableByShortDescriptionTest" extends="AdvanceCatalogSearchSimpleProductByShortDescriptionTest">
@@ -302,6 +308,8 @@
         <after>
             <deleteData createDataKey="simple1Handle" stepKey="deleteSimple1" before="deleteSimple2"/>
             <deleteData createDataKey="simple2Handle" stepKey="deleteSimple2" before="delete"/>
+            <deleteData createDataKey="childProductHandle1" stepKey="deleteChildProduct1" before="delete"/>
+            <deleteData createDataKey="childProductHandle2" stepKey="deleteChildProduct2" before="delete"/>
         </after>
     </test>
 </tests>

app/code/Magento/ConfigurableProduct/Test/Mftf/Test/StorefrontAdvanceCatalogSearchConfigurableBySkuWithHyphenTest.xml

@@ -81,6 +81,8 @@
         <after>
             <deleteData createDataKey="simple1Handle" stepKey="deleteSimple1" before="deleteSimple2"/>
             <deleteData createDataKey="simple2Handle" stepKey="deleteSimple2" before="delete"/>
+            <deleteData createDataKey="childProductHandle1" stepKey="deleteChildProduct1" before="delete"/>
+            <deleteData createDataKey="childProductHandle2" stepKey="deleteChildProduct2" before="delete"/>
         </after>
     </test>
 </tests>

dev/tests/functional/tests/app/Magento/LayeredNavigation/Test/TestCase/FilterProductListTest.xml

@@ -94,6 +94,7 @@
             <constraint name="Magento\LayeredNavigation\Test\Constraint\AssertFilterProductList" />
         </variation>
         <variation name="FilterProductListTestVariation4" summary="Use sorting category filter when layered navigation is applied" ticketId="MAGETWO-42701">
+            <data name="tag" xsi:type="string">test_type:mysql_search</data>
             <data name="configData" xsi:type="string">layered_navigation_manual_range_10</data>
             <data name="runReindex" xsi:type="boolean">true</data>
             <data name="category/dataset" xsi:type="string">default_anchor_subcategory</data>

dev/tests/functional/testsuites/Magento/Mtf/TestSuite/InjectableTests/elastic_search.xml

@@ -0,0 +1,31 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="../../../../../vendor/magento/mtf/Magento/Mtf/TestRunner/etc/testRunner.xsd">
+    <rule scope="testcase">
+        <deny>
+            <tag group="stable" value="no" />
+            <tag group="to_maintain" value="yes" />
+            <tag group="mftf_migrated" value="yes" />
+        </deny>
+    </rule>
+    <rule scope="testsuite">
+        <deny>
+            <module value="Magento_Setup" strict="1" />
+            <module value="Magento_SampleData" strict="1" />
+        </deny>
+    </rule>
+    <rule scope="variation">
+        <deny>
+            <tag group="test_type" value="3rd_party_test, 3rd_party_test_single_flow, mysql_search" />
+            <tag group="stable" value="no" />
+            <tag group="mftf_migrated" value="yes" />
+            <tag group="to_maintain" value="yes" />
+        </deny>
+    </rule>
+</config>