Skip to content

Commit f2f5ea8

Browse files
authored
Merge branch '2.4-develop' into functional-test-mainline-deployment-ver3
2 parents 67ef958 + e586f40 commit f2f5ea8

File tree

3 files changed

+15
-6
lines changed

3 files changed

+15
-6
lines changed

app/code/Magento/EncryptionKey/Test/Mftf/Test/AdminEncryptionKeyAutoGenerateKeyTest.xml

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<!--
33
/**
4-
* Copyright © Magento, Inc. All rights reserved.
5-
* See COPYING.txt for license details.
4+
* Copyright 2025 Adobe
5+
* All Rights Reserved.
66
*/
77
-->
88

@@ -18,6 +18,9 @@
1818
<group value="encryption_key"/>
1919
<group value="pr_exclude"/>
2020
<group value="cloud"/>
21+
<skip>
22+
<issueId value="AC-12680"/>
23+
</skip>
2124
</annotations>
2225

2326
<before>

app/code/Magento/EncryptionKey/Test/Mftf/Test/AdminEncryptionKeyManualGenerateKeyTest.xml

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<!--
33
/**
4-
* Copyright © Magento, Inc. All rights reserved.
5-
* See COPYING.txt for license details.
4+
* Copyright 2025 Adobe
5+
* All Rights Reserved.
66
*/
77
-->
88

@@ -18,6 +18,9 @@
1818
<group value="encryption_key"/>
1919
<group value="pr_exclude"/>
2020
<group value="cloud"/>
21+
<skip>
22+
<issueId value="AC-12680"/>
23+
</skip>
2124
</annotations>
2225

2326
<before>

app/code/Magento/User/Test/Mftf/Test/AdminSystemManageEncryptionKeyNavigateMenuTest.xml

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<!--
33
/**
4-
* Copyright © Magento, Inc. All rights reserved.
5-
* See COPYING.txt for license details.
4+
* Copyright 2025 Adobe
5+
* All Rights Reserved.
66
*/
77
-->
88

@@ -20,6 +20,9 @@
2020
<group value="mtf_migrated"/>
2121
<group value="pr_exclude"/>
2222
<group value="cloud"/>
23+
<skip>
24+
<issueId value="AC-12680"/>
25+
</skip>
2326
</annotations>
2427
<before>
2528
<actionGroup ref="AdminLoginActionGroup" stepKey="LoginAsAdmin"/>

0 commit comments

Comments
 (0)