Merge remote-tracking branch 'origin/2.3-develop' into mtf-eol

Author: tomreece

app/code/Magento/CatalogSearch/Test/Mftf/Test/SearchEntityResultsTest.xml

@@ -107,6 +107,9 @@
             <testCaseId value="MC-14794"/>
             <group value="CatalogSearch"/>
             <group value="mtf_migrated"/>
+            <skip>
+                <issueId value="MC-15827"/>
+            </skip>
         </annotations>
         <executeJS function="var s = '$createSimpleProduct.name$'; var ret=s.substring(0,2); return ret;" stepKey="getFirstTwoLetters" before="searchStorefront"/>
         <actionGroup ref="StorefrontCheckQuickSearchStringActionGroup" stepKey="searchStorefront">

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

@@ -8,6 +8,7 @@
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/mtf/etc/variations.xsd">
     <testCase name="Magento\Backend\Test\TestCase\NavigateMenuTest">
         <variation name="NavigateMenuTest1">
+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
             <data name="menuItem" xsi:type="string">System > Notifications</data>
             <data name="pageTitle" xsi:type="string">Notifications</data>
             <constraint name="Magento\Backend\Test\Constraint\AssertBackendPageIsAvailable"/>

dev/tests/functional/tests/app/Magento/AdminNotification/Test/TestCase/NavigateMenuTest.xml

@@ -8,13 +8,15 @@
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/mtf/etc/variations.xsd">
     <testCase name="Magento\Backend\Test\TestCase\NavigateMenuTest" summary="Navigate to menu chapter">
         <variation name="NavigateMenuTestBIEssentials" summary="Navigate through BI Essentials admin menu to Sign Up page" ticketId="MAGETWO-63700">
+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
             <data name="issue" xsi:type="string">MAGETWO-97261: Magento\Backend\Test\TestCase\NavigateMenuTest fails on Jenkins</data>
             <data name="menuItem" xsi:type="string">Reports > BI Essentials</data>
             <data name="waitMenuItemNotVisible" xsi:type="boolean">false</data>
             <data name="businessIntelligenceLink" xsi:type="string">https://dashboard.rjmetrics.com/v2/magento/signup</data>
             <constraint name="Magento\Analytics\Test\Constraint\AssertBIEssentialsLink" />
         </variation>
         <variation name="NavigateMenuTestAdvancedReporting" summary="Navigate through Advanced Reporting admin menu to BI Reports page" ticketId="MAGETWO-65748">
+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
             <data name="menuItem" xsi:type="string">Reports > Advanced Reporting</data>
             <data name="waitMenuItemNotVisible" xsi:type="boolean">false</data>
             <data name="advancedReportingLink" xsi:type="string">https://advancedreporting.rjmetrics.com/report</data>

dev/tests/functional/tests/app/Magento/Analytics/Test/TestCase/NavigateMenuTest.xml

@@ -8,26 +8,31 @@
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/mtf/etc/variations.xsd">
     <testCase name="Magento\Backend\Test\TestCase\NavigateMenuTest" summary="Navigate through admin menu" ticketId="MAGETWO-34874">
         <variation name="NavigateMenuTest2">
+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
             <data name="menuItem" xsi:type="string">Dashboard</data>
             <data name="pageTitle" xsi:type="string">Dashboard</data>
             <constraint name="Magento\Backend\Test\Constraint\AssertBackendPageIsAvailable" />
         </variation>
         <variation name="NavigateMenuTest3">
+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
             <data name="menuItem" xsi:type="string">Content > Schedule</data>
             <data name="pageTitle" xsi:type="string">Store Design Schedule</data>
             <constraint name="Magento\Backend\Test\Constraint\AssertBackendPageIsAvailable" />
         </variation>
         <variation name="NavigateMenuTest4">
+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
             <data name="menuItem" xsi:type="string">Stores > All Stores</data>
             <data name="pageTitle" xsi:type="string">Stores</data>
             <constraint name="Magento\Backend\Test\Constraint\AssertBackendPageIsAvailable" />
         </variation>
         <variation name="NavigateMenuTest5">
+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
             <data name="menuItem" xsi:type="string">Stores > Configuration</data>
             <data name="pageTitle" xsi:type="string">Configuration</data>
             <constraint name="Magento\Backend\Test\Constraint\AssertBackendPageIsAvailable" />
         </variation>
         <variation name="NavigateMenuTest6">
+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
             <data name="menuItem" xsi:type="string">System > Cache Management</data>
             <data name="pageTitle" xsi:type="string">Cache Management</data>
             <constraint name="Magento\Backend\Test\Constraint\AssertBackendPageIsAvailable" />

dev/tests/functional/tests/app/Magento/Backend/Test/TestCase/NavigateMenuTest.xml

@@ -8,21 +8,25 @@
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/mtf/etc/variations.xsd">
     <testCase name="Magento\Backend\Test\TestCase\NavigateMenuTest">
         <variation name="NavigateMenuTest9">
+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
             <data name="menuItem" xsi:type="string">Catalog > Products</data>
             <data name="pageTitle" xsi:type="string">Products</data>
             <constraint name="Magento\Backend\Test\Constraint\AssertBackendPageIsAvailable"/>
         </variation>
         <variation name="NavigateMenuTest10">
+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
             <data name="menuItem" xsi:type="string">Catalog > Categories</data>
             <data name="pageTitle" xsi:type="string">Default Category (ID: 2)</data>
             <constraint name="Magento\Backend\Test\Constraint\AssertBackendPageIsAvailable"/>
         </variation>
         <variation name="NavigateMenuTest11">
+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
             <data name="menuItem" xsi:type="string">Stores > Product</data>
             <data name="pageTitle" xsi:type="string">Product Attributes</data>
             <constraint name="Magento\Backend\Test\Constraint\AssertBackendPageIsAvailable"/>
         </variation>
         <variation name="NavigateMenuTest12">
+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
             <data name="menuItem" xsi:type="string">Stores > Attribute Set</data>
             <data name="pageTitle" xsi:type="string">Attribute Sets</data>
             <constraint name="Magento\Backend\Test\Constraint\AssertBackendPageIsAvailable"/>

dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/NavigateMenuTest.xml

@@ -8,6 +8,7 @@
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/mtf/etc/variations.xsd">
     <testCase name="Magento\Backend\Test\TestCase\NavigateMenuTest">
         <variation name="NavigateMenuTest14">
+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
             <data name="menuItem" xsi:type="string">Marketing > Catalog Price Rule</data>
             <data name="pageTitle" xsi:type="string">Catalog Price Rule</data>
             <constraint name="Magento\Backend\Test\Constraint\AssertBackendPageIsAvailable"/>

dev/tests/functional/tests/app/Magento/CatalogRule/Test/TestCase/NavigateMenuTest.xml

@@ -8,11 +8,13 @@
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/mtf/etc/variations.xsd">
     <testCase name="Magento\Backend\Test\TestCase\NavigateMenuTest">
         <variation name="NavigateMenuTest15">
+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
             <data name="menuItem" xsi:type="string">Marketing > Search Terms</data>
             <data name="pageTitle" xsi:type="string">Search Terms</data>
             <constraint name="Magento\Backend\Test\Constraint\AssertBackendPageIsAvailable"/>
         </variation>
         <variation name="NavigateMenuTest16">
+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
             <data name="menuItem" xsi:type="string">Reports > Search Terms</data>
             <data name="pageTitle" xsi:type="string">Search Terms Report</data>
             <constraint name="Magento\Backend\Test\Constraint\AssertBackendPageIsAvailable"/>