Merge branch '2.4-develop' into 2.4-develop-prs

Author: ishakhsuvarov

app/code/Magento/Bundle/Test/Mftf/Test/AdvanceCatalogSearchBundleByDescriptionTest.xml

@@ -17,7 +17,7 @@
             <severity value="MAJOR"/>
             <testCaseId value="MC-25427"/>
             <group value="bundle"/>
-            <group value="SearchEngineElasticsearch"/>
+            <group value="SearchEngine"/>
             <group value="pr_exclude"/>
         </annotations>
         <before>

app/code/Magento/Bundle/Test/Mftf/Test/AdvanceCatalogSearchBundleByPriceTest.xml

@@ -17,7 +17,7 @@
             <severity value="MAJOR"/>
             <testCaseId value="MC-25435"/>
             <group value="bundle"/>
-            <group value="SearchEngineElasticsearch"/>
+            <group value="SearchEngine"/>
         </annotations>
         <before>
             <createData entity="ApiProductWithDescription" stepKey="simple1" before="simple2"/>

app/code/Magento/Bundle/Test/Mftf/Test/AdvanceCatalogSearchBundleByShortDescriptionTest.xml

@@ -17,7 +17,7 @@
             <severity value="MAJOR"/>
             <testCaseId value="MC-25434"/>
             <group value="bundle"/>
-            <group value="SearchEngineElasticsearch"/>
+            <group value="SearchEngine"/>
         </annotations>
         <before>
             <createData entity="ApiProductWithDescription" stepKey="simple1" before="simple2"/>

app/code/Magento/Bundle/Test/Mftf/Test/AdvanceCatalogSearchBundleProductTest.xml

@@ -17,7 +17,7 @@
             <severity value="MAJOR"/>
             <testCaseId value="MC-25342"/>
             <group value="bundle"/>
-            <group value="SearchEngineElasticsearch"/>
+            <group value="SearchEngine"/>
         </annotations>
         <before>
             <createData entity="ApiProductWithDescription" stepKey="simple1" before="simple2"/>

app/code/Magento/Bundle/Test/Mftf/Test/StorefrontAdvanceCatalogSearchBundleBySkuWithHyphenTest.xml

@@ -17,7 +17,7 @@
             <severity value="MAJOR"/>
             <testCaseId value="MC-28812"/>
             <group value="Bundle"/>
-            <group value="SearchEngineElasticsearch"/>
+            <group value="SearchEngine"/>
             <group value="pr_exclude"/>
         </annotations>
         <before>
@@ -44,4 +44,4 @@
             <deleteData createDataKey="simple2" before="delete" stepKey="deleteSimple2"/>
         </after>
     </test>
-</tests>
+</tests>

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

@@ -17,7 +17,7 @@
             <testCaseId value="MC-25333"/>
             <group value="catalog"/>
             <group value="Product Attributes"/>
-            <group value="SearchEngineElasticsearch"/>
+            <group value="SearchEngine"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>

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

@@ -17,7 +17,7 @@
             <testCaseId value="MC-28538"/>
             <group value="Catalog"/>
             <group value="Product Attributes"/>
-            <group value="SearchEngineElasticsearch"/>
+            <group value="SearchEngine"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>

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

@@ -16,7 +16,7 @@
             <description value="User browses catalog, searches for product, adds product to cart, adds product to wishlist, compares products, uses coupon code and checks out."/>
             <severity value="CRITICAL"/>
             <testCaseId value="MAGETWO-87435"/>
-            <group value="SearchEngineElasticsearch"/>
+            <group value="SearchEngine"/>
             <group value="pr_exclude"/>
         </annotations>
         <before>

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

@@ -16,7 +16,7 @@
             <testCaseId value="MC-30209"/>
             <severity value="CRITICAL"/>
             <group value="Catalog"/>
-            <group value="SearchEngineElasticsearch"/>
+            <group value="SearchEngine"/>
             <group value="pr_exclude"/>
         </annotations>
 

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

@@ -17,7 +17,7 @@
             <severity value="MAJOR"/>
             <testCaseId value="MC-28813"/>
             <group value="Catalog"/>
-            <group value="SearchEngineElasticsearch"/>
+            <group value="SearchEngine"/>
             <group value="pr_exclude"/>
         </annotations>
         <before>