Skip to content

Commit ed3b986

Browse files
ameysarameysar
committed
MC-34987: [2.3] MFTF tests causing high load on Jenkins agents in MTSv1 platform
1 parent 5cd032e commit ed3b986

6 files changed

+33
-196
lines changed

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

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -12,15 +12,12 @@
1212
<annotations>
1313
<features value="CatalogImportExport"/>
1414
<stories value="Export products"/>
15-
<title value="DEPRECATED Export grouped product with special price"/>
15+
<title value="Export grouped product with special price"/>
1616
<description value="Admin should be able to export grouped product with special price"/>
1717
<severity value="CRITICAL"/>
1818
<testCaseId value="MC-14009"/>
1919
<group value="catalog_import_export"/>
2020
<group value="mtf_migrated"/>
21-
<skip>
22-
<issueId value="DEPRECATED">Use AdminExportGroupedProductWithSpecialProductPriceTest instead</issueId>
23-
</skip>
2421
</annotations>
2522
<before>
2623
<!-- Create first simple product and add special price -->
@@ -51,9 +48,8 @@
5148
<requiredEntity createDataKey="createSecondSimpleProduct"/>
5249
</updateData>
5350

54-
<!-- Run cron twice -->
55-
<magentoCLI command="cron:run" stepKey="runCron1"/>
56-
<magentoCLI command="cron:run" stepKey="runCron2"/>
51+
<comment userInput="Reindex invalidated indices" stepKey="runCron1"/>
52+
<actionGroup ref="CliRunReindexUsingCronJobsActionGroup" stepKey="runCron2"/>
5753

5854
<!-- Login as admin -->
5955
<actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
@@ -83,9 +79,11 @@
8379
<!-- Export created below products -->
8480
<actionGroup ref="exportAllProducts" stepKey="exportCreatedProducts"/>
8581

86-
<!-- Run cron -->
87-
<magentoCLI command="cron:run" stepKey="runCron3"/>
88-
<magentoCLI command="cron:run" stepKey="runCron4"/>
82+
<comment userInput="Start message queue for export consumer" stepKey="runCron3"/>
83+
<actionGroup ref="CliConsumerStartActionGroup" stepKey="runCron4">
84+
<argument name="consumerName" value="{{AdminExportMessageConsumerData.consumerName}}"/>
85+
<argument name="maxMessages" value="{{AdminExportMessageConsumerData.messageLimit}}"/>
86+
</actionGroup>
8987

9088
<!-- Download product -->
9189
<actionGroup ref="downloadFileByRowIndex" stepKey="downloadCreatedProducts">

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

Lines changed: 0 additions & 92 deletions
This file was deleted.

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

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -73,9 +73,8 @@
7373
<requiredEntity createDataKey="createConfigSecondChildProduct"/>
7474
</createData>
7575

76-
<!-- Run cron twice -->
77-
<magentoCLI command="cron:run" stepKey="runCron1"/>
78-
<magentoCLI command="cron:run" stepKey="runCron2"/>
76+
<comment userInput="Reindex invalidated indices after product attribute has been created/deleted" stepKey="runCron1"/>
77+
<actionGroup ref="CliRunReindexUsingCronJobsActionGroup" stepKey="runCron2"/>
7978

8079
<!-- Login as admin -->
8180
<actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
@@ -110,9 +109,11 @@
110109
<argument name="attributeData" value="$$createConfigProduct.sku$$"/>
111110
</actionGroup>
112111

113-
<!-- Run cron -->
114-
<magentoCLI command="cron:run" stepKey="runCron3"/>
115-
<magentoCLI command="cron:run" stepKey="runCron4"/>
112+
<comment userInput="Start message queue for export consumer" stepKey="runCron3"/>
113+
<actionGroup ref="CliConsumerStartActionGroup" stepKey="runCron4">
114+
<argument name="consumerName" value="{{AdminExportMessageConsumerData.consumerName}}"/>
115+
<argument name="maxMessages" value="{{AdminExportMessageConsumerData.messageLimit}}"/>
116+
</actionGroup>
116117

117118
<!-- Download product -->
118119
<actionGroup ref="downloadFileByRowIndex" stepKey="downloadCreatedProducts">

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

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -71,9 +71,8 @@
7171
<requiredEntity createDataKey="createConfigSecondChildProduct"/>
7272
</createData>
7373

74-
<!-- Run cron twice -->
75-
<magentoCLI command="cron:run" stepKey="runCron1"/>
76-
<magentoCLI command="cron:run" stepKey="runCron2"/>
74+
<comment userInput="Reindex invalidated indices after product attribute has been created/deleted" stepKey="runCron1"/>
75+
<actionGroup ref="CliRunReindexUsingCronJobsActionGroup" stepKey="runCron2"/>
7776

7877
<!-- Login as admin -->
7978
<actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
@@ -108,9 +107,11 @@
108107
<!-- Export created below products -->
109108
<actionGroup ref="exportAllProducts" stepKey="exportCreatedProducts"/>
110109

111-
<!-- Run cron -->
112-
<magentoCLI command="cron:run" stepKey="runCron3"/>
113-
<magentoCLI command="cron:run" stepKey="runCron4"/>
110+
<comment userInput="Start message queue for export consumer" stepKey="runCron3"/>
111+
<actionGroup ref="CliConsumerStartActionGroup" stepKey="runCron4">
112+
<argument name="consumerName" value="{{AdminExportMessageConsumerData.consumerName}}"/>
113+
<argument name="maxMessages" value="{{AdminExportMessageConsumerData.messageLimit}}"/>
114+
</actionGroup>
114115

115116
<!-- Download product -->
116117
<actionGroup ref="downloadFileByRowIndex" stepKey="downloadCreatedProducts">

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

Lines changed: 0 additions & 72 deletions
This file was deleted.

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

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -12,15 +12,12 @@
1212
<annotations>
1313
<features value="CatalogImportExport"/>
1414
<stories value="Export products"/>
15-
<title value="DEPRECATED Export Simple Product with custom attribute"/>
15+
<title value="Export Simple Product with custom attribute"/>
1616
<description value="Admin should be able to export Simple Product with custom attribute"/>
1717
<severity value="CRITICAL"/>
1818
<testCaseId value="MC-14007"/>
1919
<group value="catalog_import_export"/>
2020
<group value="mtf_migrated"/>
21-
<skip>
22-
<issueId value="DEPRECATED">Use AdminExportSimpleProductWithCustomAttributeSetTest instead</issueId>
23-
</skip>
2421
</annotations>
2522
<before>
2623
<!-- Create simple product with custom attribute set -->
@@ -31,9 +28,8 @@
3128
<requiredEntity createDataKey="createAttributeSet"/>
3229
</createData>
3330

34-
<!-- Run cron twice -->
35-
<magentoCLI command="cron:run" stepKey="runCron1"/>
36-
<magentoCLI command="cron:run" stepKey="runCron2"/>
31+
<comment userInput="Reindex invalidated indices after product attribute has been created/deleted" stepKey="runCron1"/>
32+
<actionGroup ref="CliRunReindexUsingCronJobsActionGroup" stepKey="runCron2"/>
3733

3834
<!-- Login as admin -->
3935
<actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
@@ -51,6 +47,9 @@
5147
</actionGroup>
5248
<!-- Log out -->
5349
<actionGroup ref="logout" stepKey="logout"/>
50+
51+
<!-- Reindex invalidated indices after product attribute has been created/deleted -->
52+
<actionGroup ref="CliRunReindexUsingCronJobsActionGroup" stepKey="reindexInvalidatedIndices"/>
5453
</after>
5554

5655
<!-- Go to export page -->
@@ -60,9 +59,11 @@
6059
<!-- Export created below products -->
6160
<actionGroup ref="exportAllProducts" stepKey="exportCreatedProducts"/>
6261

63-
<!-- Run cron -->
64-
<magentoCLI command="cron:run" stepKey="runCron3"/>
65-
<magentoCLI command="cron:run" stepKey="runCron4"/>
62+
<comment userInput="Start message queue for export consumer" stepKey="runCron3"/>
63+
<actionGroup ref="CliConsumerStartActionGroup" stepKey="runCron4">
64+
<argument name="consumerName" value="{{AdminExportMessageConsumerData.consumerName}}"/>
65+
<argument name="maxMessages" value="{{AdminExportMessageConsumerData.messageLimit}}"/>
66+
</actionGroup>
6667

6768
<!-- Download product -->
6869
<actionGroup ref="downloadFileByRowIndex" stepKey="downloadCreatedProducts">

0 commit comments

Comments
 (0)