Merge pull request #4894 from magento-arcticfoxes/MTS-683

[arcticfoxes] MTS-683: Make elasticsearch6 default search engine in Jenkins build

Author: joanhe

app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateVirtualProductWithTierPriceTest.xml

@@ -97,6 +97,10 @@
         <waitForPageLoad stepKey="waitForCategoryPageToLoad"/>
         <see selector="{{StorefrontCategoryMainSection.productLink}}" userInput="{{virtualProductBigQty.name}}" stepKey="seeVirtualProductNameOnCategoryPage"/>
 
+        <!--Run full reindex and clear caches -->
+        <magentoCLI command="indexer:reindex" stepKey="reindex"/>
+        <magentoCLI command="cache:flush" stepKey="flushCache"/>
+
         <!-- Verify customer see created virtual product with tier price(from above step) on storefront page and is searchable by sku -->
         <amOnPage url="{{StorefrontHomePage.url}}" stepKey="goToStorefront"/>
         <waitForPageLoad stepKey="waitForStoreFrontProductPageLoad"/>

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

@@ -22,7 +22,7 @@
     </rule>
     <rule scope="variation">
         <deny>
-            <tag group="test_type" value="3rd_party_test, 3rd_party_test_single_flow" />
+            <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" />

…Suite/InjectableTests/elastic_search.xml …stSuite/InjectableTests/mysql_search.xmldev/tests/functional/testsuites/Magento/Mtf/TestSuite/InjectableTests/elastic_search.xml renamed to dev/tests/functional/testsuites/Magento/Mtf/TestSuite/InjectableTests/mysql_search.xml dev/tests/functional/testsuites/Magento/Mtf/TestSuite/InjectableTests/elastic_search.xml renamed to dev/tests/functional/testsuites/Magento/Mtf/TestSuite/InjectableTests/mysql_search.xml

@@ -22,7 +22,7 @@
     </rule>
     <rule scope="variation">
         <deny>
-            <tag group="test_type" value="3rd_party_test, 3rd_party_test_single_flow, mysql_search" />
+            <tag group="test_type" value="3rd_party_test, 3rd_party_test_single_flow" />
             <tag group="stable" value="no" />
             <tag group="mftf_migrated" value="yes" />
             <tag group="to_maintain" value="yes" />