Merge branch 'stability_control' into ACQE-5132

Author: magento-devops-queue-mgr-svc

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

@@ -24,31 +24,24 @@
             <createData entity="_defaultCategory" stepKey="createAnchoredCategory1"/>
             <createData entity="_defaultCategory" stepKey="createSecondCategory"/>
 
-            <!-- Switch "Category Product" and "Product Category" indexers to "Update by Schedule" mode -->
-            <actionGroup ref="AdminOpenIndexManagementPageActionGroup" stepKey="onIndexManagement"/>
-
-            <actionGroup ref="AdminSwitchIndexerToActionModeActionGroup" stepKey="switchCategoryProduct">
-                <argument name="indexerValue" value="catalog_category_product"/>
-            </actionGroup>
-            <actionGroup ref="AdminSwitchIndexerToActionModeActionGroup" stepKey="switchProductCategory">
-                <argument name="indexerValue" value="catalog_product_category"/>
-            </actionGroup>
-            <actionGroup ref="AdminSwitchIndexerToActionModeActionGroup" stepKey="switchCatalogSearch">
-                <argument name="indexerValue" value="catalogsearch_fulltext"/>
+            <comment userInput="BIC workaround" stepKey="onIndexManagement"/>
+            <comment userInput="BIC workaround" stepKey="switchCategoryProduct"/>
+            <comment userInput="BIC workaround" stepKey="switchProductCategory"/>
+            <comment userInput="BIC workaround" stepKey="switchCatalogSearch"/>
+
+            <!-- Switch "Category Product", "Product Category" and "Catalog Search" indexers to "Update by Schedule" mode -->
+            <actionGroup ref="CliIndexerSetScheduleModeActionGroup" stepKey="setScheduleIndexerMode">
+                <argument name="indices" value="catalog_category_product catalog_product_category catalogsearch_fulltext"/>
             </actionGroup>
         </before>
 
         <after>
-            <!-- Switch "Category Product" and "Product Category" indexers to "Update by Save" mode -->
-            <actionGroup ref="AdminOpenIndexManagementPageActionGroup" stepKey="onIndexManagement"/>
-
-            <actionGroup ref="AdminSwitchIndexerToActionModeActionGroup" stepKey="switchCategoryProduct">
-                <argument name="indexerValue" value="catalog_category_product"/>
-                <argument name="action" value="Update on Save"/>
-            </actionGroup>
-            <actionGroup ref="AdminSwitchIndexerToActionModeActionGroup" stepKey="switchProductCategory">
-                <argument name="indexerValue" value="catalog_product_category"/>
-                <argument name="action" value="Update on Save"/>
+            <comment userInput="BIC workaround" stepKey="onIndexManagement"/>
+            <comment userInput="BIC workaround" stepKey="switchCategoryProduct"/>
+            <comment userInput="BIC workaround" stepKey="switchProductCategory"/>
+            <!-- Switch "Category Product", "Product Category" and "Catalog Search" indexers to "Update by Save" mode -->
+            <actionGroup ref="CliIndexerSetRealtimeModeActionGroup" stepKey="setRealtimeIndexerMode">
+                <argument name="indices" value="catalog_category_product catalog_product_category catalogsearch_fulltext"/>
             </actionGroup>
 
             <deleteData createDataKey="simpleProduct" stepKey="deleteProduct"/>

app/code/Magento/Indexer/Test/Mftf/ActionGroup/CliIndexerSetRealtimeModeActionGroup.xml

@@ -11,7 +11,10 @@
         <annotations>
             <description>Set indexers to realtime mode.</description>
         </annotations>
+        <arguments>
+            <argument name="indices" type="string"/>
+        </arguments>
 
-        <magentoCLI command="indexer:set-mode" arguments="realtime" stepKey="setRealtimeIndexerMode"/>
+        <magentoCLI command="indexer:set-mode" arguments="realtime {{indices}}" stepKey="setRealtimeIndexerMode"/>
     </actionGroup>
 </actionGroups>

app/code/Magento/Indexer/Test/Mftf/ActionGroup/CliIndexerSetScheduleModeActionGroup.xml

@@ -11,7 +11,10 @@
         <annotations>
             <description>Set indexers to schedule mode.</description>
         </annotations>
+        <arguments>
+            <argument name="indices" type="string"/>
+        </arguments>
 
-        <magentoCLI command="indexer:set-mode" arguments="schedule" stepKey="setScheduleIndexerMode"/>
+        <magentoCLI command="indexer:set-mode" arguments="schedule {{indices}}" stepKey="setScheduleIndexerMode"/>
     </actionGroup>
 </actionGroups>