Skip to content

Commit 7f536a2

Browse files
magento-devops-queue-mgr-svcmagento-devops-queue-mgr-svc
authored
Merge branch 'stability_control' into ACQE-5132
2 parents 5294bfa + f34cd2e commit 7f536a2

File tree

41 files changed

+188
-69
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

41 files changed

+188
-69
lines changed

‎app/code/Magento/AsyncConfig/Test/Mftf/Test/AsyncConfigurationTest.xml

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,14 +21,18 @@
2121
<before>
2222
<!--Enable Async Configuration-->
2323
<magentoCLI stepKey="EnableAsyncConfig" command="setup:config:set --no-interaction --config-async 1"/>
24-
<magentoCLI stepKey="ClearConfigCache" command="cache:flush"/>
24+
<actionGroup ref="CliCacheFlushActionGroup" stepKey="ClearConfigCache">
25+
<argument name="tags" value=""/>
26+
</actionGroup>
2527
<!--Login to Admin-->
2628
<actionGroup ref="AdminLoginActionGroup" stepKey="LoginAsAdmin"/>
2729
</before>
2830
<after>
2931
<magentoCLI stepKey="DisableAsyncConfig" command="setup:config:set --no-interaction --config-async 0"/>
3032
<magentoCLI stepKey="setBackDefaultConfigValue" command="config:set catalog/frontend/grid_per_page 12" />
31-
<magentoCLI stepKey="ClearConfigCache" command="cache:clean"/>
33+
<actionGroup ref="CliCacheCleanActionGroup" stepKey="ClearConfigCache">
34+
<argument name="tags" value="config"/>
35+
</actionGroup>
3236
<actionGroup ref="AdminLogoutActionGroup" stepKey="adminLogout"/>
3337
</after>
3438

‎app/code/Magento/Backend/Test/Mftf/Test/AdminCatalogEmailToFriendSettingsTest.xml

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,19 +15,23 @@
1515
<title value="Admin should be able to manage settings of Email To A Friend Functionality"/>
1616
<description value="Admin should be able to enable Email To A Friend functionality in Magento Admin backend and see additional options"/>
1717
<group value="backend"/>
18-
<severity value="MINOR"></severity>
18+
<severity value="MINOR"/>
1919
<testCaseId value="MC-35895"/>
2020
<group value="pr_exclude"/>
2121
</annotations>
2222

2323
<before>
2424
<actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
2525
<magentoCLI stepKey="enableSendFriend" command="config:set sendfriend/email/enabled 1"/>
26-
<magentoCLI stepKey="cacheClean" command="cache:clean config"/>
26+
<actionGroup ref="CliCacheCleanActionGroup" stepKey="cacheClean">
27+
<argument name="tags" value="config"/>
28+
</actionGroup>
2729
</before>
2830
<after>
2931
<magentoCLI stepKey="disableSendFriend" command="config:set sendfriend/email/enabled 0"/>
30-
<magentoCLI stepKey="cacheClean" command="cache:clean config"/>
32+
<actionGroup ref="CliCacheCleanActionGroup" stepKey="cacheClean">
33+
<argument name="tags" value="config"/>
34+
</actionGroup>
3135
<actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
3236
</after>
3337

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

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,9 @@
2424
<actionGroup ref="CliIndexerReindexActionGroup" stepKey="performReindex">
2525
<argument name="indices" value=""/>
2626
</actionGroup>
27-
<magentoCLI command="cache:flush" stepKey="cleanCache"/>
27+
<actionGroup ref="CliCacheFlushActionGroup" stepKey="cleanCache">
28+
<argument name="tags" value=""/>
29+
</actionGroup>
2830
</before>
2931

3032
<after>
@@ -37,7 +39,9 @@
3739
<actionGroup ref="CliIndexerReindexActionGroup" stepKey="performReindex">
3840
<argument name="indices" value=""/>
3941
</actionGroup>
40-
<magentoCLI command="cache:flush" stepKey="cleanCache"/>
42+
<actionGroup ref="CliCacheFlushActionGroup" stepKey="cleanCache">
43+
<argument name="tags" value=""/>
44+
</actionGroup>
4145
<actionGroup ref="AdminLogoutActionGroup" stepKey="logoutOfAdmin"/>
4246
</after>
4347

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,9 @@
133133
<actionGroup ref="CliIndexerReindexActionGroup" stepKey="performReindex">
134134
<argument name="indices" value=""/>
135135
</actionGroup>
136-
<magentoCLI command="cache:flush" stepKey="cleanCache"/>
136+
<actionGroup ref="CliCacheFlushActionGroup" stepKey="cleanCache">
137+
<argument name="tags" value=""/>
138+
</actionGroup>
137139
<actionGroup ref="AdminAssertParentChildCategoryTreeElementsActionGroup" stepKey="assertParentChildCategoryTreeElements4thTime">
138140
<argument name="parentCategoryName" value="Default Category"/>
139141
<argument name="childCategoryName" value="$createSubTestCategory.name$"/>

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

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,9 @@
5050
<requiredEntity createDataKey="createCategory"/>
5151
</createData>
5252
<actionGroup ref="EnableWebUrlOptionsActionGroup" stepKey="addStoreCodeToUrls"/>
53-
<magentoCLI command="cache:clean" stepKey="cleanCacheBefore"/>
53+
<actionGroup ref="CliCacheCleanActionGroup" stepKey="cleanCacheBefore">
54+
<argument name="tags" value="config"/>
55+
</actionGroup>
5456
</before>
5557
<after>
5658
<!-- Change indexers to "Update on Save" mode -->
@@ -70,7 +72,9 @@
7072
<actionGroup ref="CliIndexerReindexActionGroup" stepKey="reindex">
7173
<argument name="indices" value=""/>
7274
</actionGroup>
73-
<magentoCLI command="cache:clean" stepKey="cleanCacheAfter"/>
75+
<actionGroup ref="CliCacheCleanActionGroup" stepKey="cacheCleanAfter">
76+
<argument name="tags" value="config"/>
77+
</actionGroup>
7478
</after>
7579

7680
<!-- Open storefront on second store -->

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,9 @@
2424
<actionGroup ref="CliIndexerReindexActionGroup" stepKey="reindex">
2525
<argument name="indices" value=""/>
2626
</actionGroup>
27-
<magentoCLI command="cache:flush" stepKey="flushCache"/>
27+
<actionGroup ref="CliCacheFlushActionGroup" stepKey="flushCache">
28+
<argument name="tags" value=""/>
29+
</actionGroup>
2830
</before>
2931

3032
<after>

‎app/code/Magento/Checkout/Test/Mftf/Test/StorefrontGuestCheckoutTest/StorefrontGuestCheckoutAddNewAddressTest.xml

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,14 +26,18 @@
2626
<requiredEntity createDataKey="createCategory"/>
2727
</createData>
2828
<magentoCLI command="config:set customer/address/street_lines 4" stepKey="setStreetLineNo"/>
29-
<magentoCLI command="cache:clean config" stepKey="cacheCleanBefore"/>
29+
<actionGroup ref="CliCacheCleanActionGroup" stepKey="cleanCacheBefore">
30+
<argument name="tags" value="config"/>
31+
</actionGroup>
3032
</before>
3133
<after>
3234
<actionGroup ref="AdminLogoutActionGroup" stepKey="adminLogout"/>
3335
<deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
3436
<deleteData createDataKey="createProduct" stepKey="deleteProduct"/>
3537
<magentoCLI command="config:set customer/address/street_lines 2" stepKey="resetStreetLineNo"/>
36-
<magentoCLI command="cache:clean config" stepKey="cacheCleanAfter"/>
38+
<actionGroup ref="CliCacheCleanActionGroup" stepKey="cacheCleanAfter">
39+
<argument name="tags" value="config"/>
40+
</actionGroup>
3741
</after>
3842

3943
<amOnPage url="{{StorefrontCategoryPage.url($$createCategory.custom_attributes[url_key]$$)}}" stepKey="onCategoryPage"/>

‎app/code/Magento/Checkout/Test/Mftf/Test/StorefrontPersistentDataForRegisteredCustomerWithVirtualQuoteTest.xml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,9 @@
2626
<createData entity="Simple_US_CA_Customer" stepKey="createCustomer"/>
2727
<magentoCLI command="config:set {{EnableFlatRateConfigData.path}} {{EnableFlatRateConfigData.value}}" stepKey="enableFlatRate"/>
2828
<magentoCLI command="config:set {{EnablePaymentCheckMOConfigData.path}} {{EnablePaymentCheckMOConfigData.value}}" stepKey="enableCheckMoneyOrderPayment"/>
29-
<magentoCLI command="cache:clean config" stepKey="flushCache"/>
29+
<actionGroup ref="CliCacheCleanActionGroup" stepKey="flushCache">
30+
<argument name="tags" value="config"/>
31+
</actionGroup>
3032
<actionGroup ref="StorefrontOpenHomePageActionGroup" stepKey="goToStorefront"/>
3133
<executeJS function="window.localStorage.clear();" stepKey="clearLocalStorage"/>
3234
</before>

‎app/code/Magento/Checkout/Test/Mftf/Test/VerifyThatOptionAllowToChooseStateIfItIsOptionalForCountryIsApplicableForCheckoutFlowTest.xml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,9 @@
3636
<actionGroup ref="CliIndexerReindexActionGroup" stepKey="reindex">
3737
<argument name="indices" value=""/>
3838
</actionGroup>
39-
<magentoCLI stepKey="flushCache" command="cache:flush"/>
39+
<actionGroup ref="CliCacheFlushActionGroup" stepKey="flushCache">
40+
<argument name="tags" value=""/>
41+
</actionGroup>
4042
<actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
4143
</after>
4244
<amOnPage url="{{StorefrontProductPage.url($$createProduct.custom_attributes[url_key]$$)}}" stepKey="goToProductPageOnStorefront"/>

‎app/code/Magento/Cms/Test/Mftf/Test/AdminAddUpdateDeleteWidgetOfTypeCatalogCategoryLinkTypeTest.xml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,9 @@
7070
<argument name="row" value="1"/>
7171
</actionGroup>
7272
<waitForPageLoad stepKey="waitToDeleteAllWidgets"/>
73-
<magentoCLI command="cache:flush" stepKey="cleanCache"/>
73+
<actionGroup ref="CliCacheFlushActionGroup" stepKey="cleanCache">
74+
<argument name="tags" value=""/>
75+
</actionGroup>
7476
<actionGroup ref="StorefrontOpenHomePageActionGroup" stepKey="navigateToHomePage3"/>
7577
<waitForPageLoad stepKey="waitToLoadHomePage3"/>
7678
<dontSeeElement selector="{{StorefrontHeaderSection.categoryWidgetLink}}" stepKey="doNotSeeWidgetLink"/>

0 commit comments

Comments
 (0)