From 850788ca08974eca26eefdd595fcab31939b6808 Mon Sep 17 00:00:00 2001
From: Katie Goines <30757403+katiegoines@users.noreply.github.com>
Date: Mon, 8 Aug 2022 17:15:40 -0700
Subject: [PATCH] Updating config.yml to mitigate circle CI pipeline failures
 from outdated Xcode image (#10158)

* updating config.yml for testing changes to staging

* removing android integ tests for now

* Update config.yml

* removing code used for testing

Co-authored-by: Francisco Rodriguez <frodriguez.cs@gmail.com>
---
 .circleci/config.yml | 60 ++++++++++++++++++++------------------------
 1 file changed, 27 insertions(+), 33 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 16348b676cd..d68eaa93109 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -37,12 +37,6 @@ executors:
       xcode: 13.2.1
     resource_class: large
 
-  # For RN apps that need to be upgraded before using latest iOS/macOS
-  macos-executor-legacy:
-    macos:
-      xcode: 11.5.0
-    resource_class: large
-
 test_env_vars: &test_env_vars
   environment:
     NPM_REGISTRY: http://0.0.0.0:4873/
@@ -1008,7 +1002,7 @@ jobs:
           spec: delete-user
           browser: << parameters.browser >>
   integ_rn_ios_storage:
-    executor: macos-executor-legacy
+    executor: macos-executor
     <<: *test_env_vars
     working_directory: ~/amplify-js-samples-staging/samples/react-native/storage/StorageApp
     steps:
@@ -1028,19 +1022,19 @@ jobs:
     steps:
       - integ_test_rn_ios
 
-  integ_rn_android_storage:
-    executor: macos-executor-legacy
-    <<: *test_env_vars
-    working_directory: ~/amplify-js-samples-staging/samples/react-native/storage/StorageApp
-    steps:
-      - integ_test_rn_android
+  # integ_rn_android_storage:
+  #   executor: macos-executor
+  #   <<: *test_env_vars
+  #   working_directory: ~/amplify-js-samples-staging/samples/react-native/storage/StorageApp
+  #   steps:
+  #     - integ_test_rn_android
 
-  integ_rn_android_storage_multipart_progress:
-    executor: macos-executor-legacy
-    <<: *test_env_vars
-    working_directory: ~/amplify-js-samples-staging/samples/react-native/storage/MultiPartUploadWithProgress
-    steps:
-      - integ_test_rn_android
+  # integ_rn_android_storage_multipart_progress:
+  #   executor: macos-executor
+  #   <<: *test_env_vars
+  #   working_directory: ~/amplify-js-samples-staging/samples/react-native/storage/MultiPartUploadWithProgress
+  #   steps:
+  #     - integ_test_rn_android
 
   integ_rn_ios_datastore_sqlite_adapter:
     executor: macos-executor
@@ -1554,18 +1548,18 @@ workflows:
             - build
           filters:
             <<: *releasable_branches
-      - integ_rn_android_storage:
-          requires:
-            - integ_setup
-            - build
-          filters:
-            <<: *releasable_branches
-      - integ_rn_android_storage_multipart_progress:
-          requires:
-            - integ_setup
-            - build
-          filters:
-            <<: *releasable_branches
+      # - integ_rn_android_storage:
+      #     requires:
+      #       - integ_setup
+      #       - build
+      #     filters:
+      #       <<: *releasable_branches
+      # - integ_rn_android_storage_multipart_progress:
+      #     requires:
+      #       - integ_setup
+      #       - build
+      #     filters:
+      #       <<: *releasable_branches
       - integ_rn_ios_datastore_sqlite_adapter:
           requires:
             - integ_setup
@@ -1654,9 +1648,9 @@ workflows:
             - integ_vue_auth
             - integ_rn_ios_storage
             - integ_rn_ios_storage_multipart_progress
-            - integ_rn_android_storage_multipart_progress
+            # - integ_rn_android_storage_multipart_progress
             - integ_rn_ios_push_notifications
-            - integ_rn_android_storage
+            # - integ_rn_android_storage
             - integ_rn_ios_datastore_sqlite_adapter
             - integ_datastore_auth
             - integ_datastore_auth_v2