Merge remote-tracking branch 'commerce/release' into ph-delivery

xmav · xmav · commit e8c8ba0e9d86 · 2022-01-11T18:44:54.000-06:00
diff --git a/app/code/Magento/AwsS3PageBuilder/Test/Mftf/Test/AdminPageBuilderImageTest/AwsS3ImageAddImageContentTypeToCMSPageTest.xml b/app/code/Magento/AwsS3PageBuilder/Test/Mftf/Test/AdminPageBuilderImageTest/AwsS3ImageAddImageContentTypeToCMSPageTest.xml
@@ -19,6 +19,7 @@
             <group value="pagebuilder"/>
             <group value="pagebuilder-image"/>
             <group value="remote_storage_aws_s3"/>
+            <group value="skip_in_cloud_native_s3"/>
             <group value="remote_storage_aws_s3_pagebuilder"/>
         </annotations>
         <before>
diff --git a/app/code/Magento/AwsS3PageBuilder/Test/Mftf/Test/AdminPageBuilderImageTest/AwsS3ImageAddImageIntoPageBuilderStageTest.xml b/app/code/Magento/AwsS3PageBuilder/Test/Mftf/Test/AdminPageBuilderImageTest/AwsS3ImageAddImageIntoPageBuilderStageTest.xml
@@ -19,6 +19,7 @@
             <group value="pagebuilder"/>
             <group value="pagebuilder-image"/>
             <group value="remote_storage_aws_s3"/>
+            <group value="skip_in_cloud_native_s3"/>
             <group value="remote_storage_aws_s3_pagebuilder"/>
         </annotations>
         <before>
diff --git a/app/code/Magento/AwsS3PageBuilder/Test/Mftf/Test/AdminPageBuilderImageTest/AwsS3ImageInvalidFileTypeValidationTest.xml b/app/code/Magento/AwsS3PageBuilder/Test/Mftf/Test/AdminPageBuilderImageTest/AwsS3ImageInvalidFileTypeValidationTest.xml
@@ -17,6 +17,7 @@
             <group value="pagebuilder"/>
             <group value="pagebuilder-image"/>
             <group value="remote_storage_aws_s3"/>
+            <group value="skip_in_cloud_native_s3"/>
             <group value="remote_storage_aws_s3_pagebuilder"/>
         </annotations>
         <before>
diff --git a/app/code/Magento/AwsS3PageBuilder/Test/Mftf/Test/AdminPageBuilderImageTest/AwsS3ImageRemoveImageFromStageTest.xml b/app/code/Magento/AwsS3PageBuilder/Test/Mftf/Test/AdminPageBuilderImageTest/AwsS3ImageRemoveImageFromStageTest.xml
@@ -19,6 +19,7 @@
             <group value="pagebuilder"/>
             <group value="pagebuilder-image"/>
             <group value="remote_storage_aws_s3"/>
+            <group value="skip_in_cloud_native_s3"/>
             <group value="remote_storage_aws_s3_pagebuilder"/>
         </annotations>
         <before>
diff --git a/app/code/Magento/AwsS3PageBuilder/Test/Mftf/Test/AdminPageBuilderTemplateTests/AwsS3PageBuilderCreateTemplateOnCMSBlockForPageAndApplyTemplateToCatalogCategory.xml b/app/code/Magento/AwsS3PageBuilder/Test/Mftf/Test/AdminPageBuilderTemplateTests/AwsS3PageBuilderCreateTemplateOnCMSBlockForPageAndApplyTemplateToCatalogCategory.xml
@@ -21,6 +21,7 @@
             <group value="pagebuilder-cms-block"/>
             <group value="pagebuilder-cms-category"/>
             <group value="remote_storage_aws_s3"/>
+            <group value="skip_in_cloud_native_s3"/>
             <group value="remote_storage_aws_s3_pagebuilder"/>
         </annotations>
         <before>
diff --git a/app/code/Magento/AwsS3PageBuilder/Test/Mftf/Test/AdminPageBuilderTemplateTests/AwsS3PageBuilderDeleteTemplate.xml b/app/code/Magento/AwsS3PageBuilder/Test/Mftf/Test/AdminPageBuilderTemplateTests/AwsS3PageBuilderDeleteTemplate.xml
@@ -19,6 +19,7 @@
             <group value="pagebuilder"/>
             <group value="pagebuilder-templates"/>
             <group value="remote_storage_aws_s3"/>
+            <group value="skip_in_cloud_native_s3"/>
             <group value="remote_storage_aws_s3_pagebuilder"/>
         </annotations>
         <before>
diff --git a/app/code/Magento/AwsS3PageBuilder/Test/Mftf/Test/AdminPageBuilderTemplateTests/AwsS3PageBuilderVerifySaveContentAsTemplateModalAndApplyTemplateSlideOut.xml b/app/code/Magento/AwsS3PageBuilder/Test/Mftf/Test/AdminPageBuilderTemplateTests/AwsS3PageBuilderVerifySaveContentAsTemplateModalAndApplyTemplateSlideOut.xml
@@ -19,6 +19,7 @@
             <group value="pagebuilder"/>
             <group value="pagebuilder-templates"/>
             <group value="remote_storage_aws_s3"/>
+            <group value="skip_in_cloud_native_s3"/>
             <group value="remote_storage_aws_s3_pagebuilder"/>
         </annotations>
         <before>
diff --git a/app/code/Magento/AwsS3PageBuilder/Test/Mftf/Test/AdminPageBuilderVideoTest/AwsS3CanAddVideoToColumnTest.xml b/app/code/Magento/AwsS3PageBuilder/Test/Mftf/Test/AdminPageBuilderVideoTest/AwsS3CanAddVideoToColumnTest.xml
@@ -20,6 +20,7 @@
             <group value="pagebuilder-column"/>
             <group value="pagebuilder-video"/>
             <group value="remote_storage_aws_s3"/>
+            <group value="skip_in_cloud_native_s3"/>
             <group value="remote_storage_aws_s3_pagebuilder"/>
         </annotations>
         <before>
