Skip to content

Commit 7da7b7b

Browse files
zakdmazakdma
committed
MC-34482: MFTF tests causing high load on Jenkins agents in MTSv1 platfor
1 parent 117fed7 commit 7da7b7b

20 files changed

+105
-36
lines changed

‎app/code/Magento/Backend/Test/Mftf/ActionGroup/CliCacheCleanActionGroup.xml

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!--
3+
/**
4+
* Copyright © Magento, Inc. All rights reserved.
5+
* See COPYING.txt for license details.
6+
*/
7+
-->
8+
9+
<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
10+
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
11+
<actionGroup name="CliCacheCleanActionGroup">
12+
<annotations>
13+
<description>Run cache:clean by CLI with specified cache tags (space separated).</description>
14+
</annotations>
15+
<arguments>
16+
<argument name="tags" type="string" defaultValue="full_page"/>
17+
</arguments>
18+
19+
<magentoCLI command="cache:clean" arguments="{{tags}}" stepKey="cleanSpecifiedCache"/>
20+
</actionGroup>
21+
</actionGroups>

‎app/code/Magento/Backend/Test/Mftf/ActionGroup/CliCacheFlushActionGroup.xml

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!--
3+
/**
4+
* Copyright © Magento, Inc. All rights reserved.
5+
* See COPYING.txt for license details.
6+
*/
7+
-->
8+
9+
<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
10+
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
11+
<actionGroup name="CliCacheFlushActionGroup">
12+
<annotations>
13+
<description>Run cache:flush by CLI with specified cache tags (space separated).</description>
14+
</annotations>
15+
<arguments>
16+
<argument name="tags" type="string" defaultValue="full_page"/>
17+
</arguments>
18+
19+
<magentoCLI command="cache:flush" arguments="{{tags}}" stepKey="flushSpecifiedCache"/>
20+
</actionGroup>
21+
</actionGroups>

‎app/code/Magento/Bundle/Test/Mftf/Test/AdminShouldBeAbleToMassUpdateAttributesForBundleProductsTest.xml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,8 +57,9 @@
5757
<argument name="product" value="UpdateAttributeNameAndDescription"/>
5858
</actionGroup>
5959
<!-- Start message queue for product attribute consumer -->
60-
<actionGroup ref="AdminStartMessageQueueConsumerActionGroup" stepKey="startMessageQueue">
61-
<argument name="consumer" value="AdminProductAttributeUpdateMessageConsumerData"/>
60+
<actionGroup ref="CliConsumerStartActionGroup" stepKey="startMessageQueue">
61+
<argument name="consumerName" value="{{AdminProductAttributeUpdateMessageConsumerData.consumerName}}"/>
62+
<argument name="maxMessages" value="{{AdminProductAttributeUpdateMessageConsumerData.messageLimit}}"/>
6263
</actionGroup>
6364
<!-- Search for a product with a new name and Open Product -->
6465
<actionGroup ref="FilterProductGridByNameActionGroup" stepKey="searchWithNewProductName">

‎app/code/Magento/Catalog/Test/Mftf/Data/QueueConsumerData.xml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,11 @@
99
<entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
1010
xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataProfileSchema.xsd">
1111
<entity name="AdminProductAttributeUpdateConsumerData">
12-
<data key="consumer_name">product_action_attribute.update</data>
13-
<data key="message_limit">100</data>
12+
<data key="consumerName">product_action_attribute.update</data>
13+
<data key="messageLimit">100</data>
1414
</entity>
1515
<entity name="AdminProductAttributeWebsiteUpdateConsumerData">
16-
<data key="consumer_name">product_action_attribute.website.update</data>
17-
<data key="message_limit">100</data>
16+
<data key="consumerName">product_action_attribute.website.update</data>
17+
<data key="messageLimit">100</data>
1818
</entity>
1919
</entities>

‎app/code/Magento/Catalog/Test/Mftf/Test/AdminMassProductPriceUpdateTest.xml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,8 +57,9 @@
5757
<see selector="{{AdminProductMessagesSection.successMessage}}" userInput="Message is added to queue" stepKey="seeAttributeUpateSuccessMsg"/>
5858

5959
<!-- Start message queue -->
60-
<actionGroup ref="AdminStartMessageQueueConsumerActionGroup" stepKey="startMessageQueueConsumer">
61-
<argument name="consumer" value="AdminProductAttributeUpdateConsumerData"/>
60+
<actionGroup ref="CliConsumerStartActionGroup" stepKey="startMessageQueueConsumer">
61+
<argument name="consumerName" value="{{AdminProductAttributeUpdateConsumerData.consumerName}}"/>
62+
<argument name="maxMessages" value="{{AdminProductAttributeUpdateConsumerData.messageLimit}}"/>
6263
</actionGroup>
6364
<!-- Run cron -->
6465
<magentoCLI command="cron:run --group=index" stepKey="runCron"/>

‎app/code/Magento/Catalog/Test/Mftf/Test/AdminMassUpdateProductAttributesGlobalScopeTest.xml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -67,8 +67,9 @@
6767
<see selector="{{AdminMessagesSection.success}}" userInput="Message is added to queue" stepKey="seeAttributeUpdateSuccessMsg"/>
6868

6969
<!-- Start message queue for product attribute consumer -->
70-
<actionGroup ref="AdminStartMessageQueueConsumerActionGroup" stepKey="startMessageQueue">
71-
<argument name="consumer" value="AdminProductAttributeUpdateMessageConsumerData"/>
70+
<actionGroup ref="CliConsumerStartActionGroup" stepKey="startMessageQueue">
71+
<argument name="consumerName" value="{{AdminProductAttributeUpdateMessageConsumerData.consumerName}}"/>
72+
<argument name="maxMessages" value="{{AdminProductAttributeUpdateMessageConsumerData.messageLimit}}"/>
7273
</actionGroup>
7374

7475
<!-- Assert on storefront default view -->

‎app/code/Magento/CatalogImportExport/Test/Mftf/Test/AdminExportBundleProductTest.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@
8181
</createData>
8282

8383
<!-- Start message queue for export consumer -->
84-
<actionGroup ref="AdminStartMessageQueueConsumerActionGroup" stepKey="startMessageQueue"/>
84+
<actionGroup ref="CliConsumerStartActionGroup" stepKey="startMessageQueue"/>
8585
<reloadPage stepKey="refreshPage"/>
8686
<waitForPageLoad stepKey="waitForPageLoaded"/>
8787
<actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>

‎app/code/Magento/CatalogImportExport/Test/Mftf/Test/AdminExportGroupedProductWithSpecialPriceTest.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@
6868
<actionGroup ref="ExportAllProductsActionGroup" stepKey="exportCreatedProducts"/>
6969

7070
<!-- Start message queue for export consumer -->
71-
<actionGroup ref="AdminStartMessageQueueConsumerActionGroup" stepKey="startMessageQueue"/>
71+
<actionGroup ref="CliConsumerStartActionGroup" stepKey="startMessageQueue"/>
7272
<reloadPage stepKey="refreshPage"/>
7373
<waitForPageLoad stepKey="waitForPageLoaded"/>
7474

‎app/code/Magento/CatalogImportExport/Test/Mftf/Test/AdminExportImportConfigurableProductWithImagesTest.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -165,7 +165,7 @@
165165
</actionGroup>
166166

167167
<!-- Start message queue for export consumer -->
168-
<actionGroup ref="AdminStartMessageQueueConsumerActionGroup" stepKey="startMessageQueue"/>
168+
<actionGroup ref="CliConsumerStartActionGroup" stepKey="startMessageQueue"/>
169169
<reloadPage stepKey="refreshPage"/>
170170
<waitForPageLoad stepKey="waitForPageLoaded"/>
171171

‎app/code/Magento/CatalogImportExport/Test/Mftf/Test/AdminExportSimpleAndConfigurableProductsWithCustomOptionsTest.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@
9999
</actionGroup>
100100

101101
<!-- Start message queue for export consumer -->
102-
<actionGroup ref="AdminStartMessageQueueConsumerActionGroup" stepKey="startMessageQueue"/>
102+
<actionGroup ref="CliConsumerStartActionGroup" stepKey="startMessageQueue"/>
103103
<reloadPage stepKey="refreshPage"/>
104104
<waitForPageLoad stepKey="waitForPageLoaded"/>
105105

0 commit comments

Comments
 (0)