chore: run all tests

aws-amplify · Jul 14, 2023 · fcb2afa · fcb2afa
1 parent fb26f0c
commit fcb2afa
Show file tree

Hide file tree

Showing 2 changed files with 106 additions and 107 deletions.
diff --git a/.codebuild/e2e_workflow.yml b/.codebuild/e2e_workflow.yml
@@ -10,122 +10,121 @@ batch:
       buildspec: .codebuild/build_linux.yml
       env:
         compute-type: BUILD_GENERAL1_LARGE
-    # - identifier: test
-    #   buildspec: .codebuild/test.yml
-    #   env:
-    #     compute-type: BUILD_GENERAL1_LARGE
-    #   depend-on:
-    #     - build_linux
-    # - identifier: verify_api_extract
-    #   buildspec: .codebuild/verify_api_extract.yml
-    #   env:
-    #     compute-type: BUILD_GENERAL1_MEDIUM
-    #   depend-on:
-    #     - build_linux
+    - identifier: test
+      buildspec: .codebuild/test.yml
+      env:
+        compute-type: BUILD_GENERAL1_LARGE
+      depend-on:
+        - build_linux
+    - identifier: verify_api_extract
+      buildspec: .codebuild/verify_api_extract.yml
+      env:
+        compute-type: BUILD_GENERAL1_MEDIUM
+      depend-on:
+        - build_linux
     - identifier: publish_to_local_registry
       buildspec: .codebuild/publish_to_local_registry.yml
       env:
         compute-type: BUILD_GENERAL1_MEDIUM
       depend-on:
         - build_linux
-    # - identifier: build_app_swift
-    #   buildspec: .codebuild/run_ios_modelgen_e2e_test.yml
-    #   env:
-    #     compute-type: BUILD_GENERAL1_LARGE
-    #     variables:
-    #       TEST_SUITE: src/__tests__/build-app-swift.test.ts
-    #       CLI_REGION: us-east-2
-    #   depend-on:
-    #     - publish_to_local_registry
-    # - identifier: >-
-    #     add_codegen_ios_configure_codegen_android_configure_codegen_js_graphql_codegen_android
-    #   buildspec: .codebuild/run_e2e_tests.yml
-    #   env:
-    #     compute-type: BUILD_GENERAL1_LARGE
-    #     variables:
-    #       TEST_SUITE: >-
-    #         src/__tests__/add-codegen-ios.test.ts|src/__tests__/configure-codegen-android.test.ts|src/__tests__/configure-codegen-js.test.ts|src/__tests__/graphql-codegen-android.test.ts
-    #       CLI_REGION: us-east-1
-    #   depend-on:
-    #     - publish_to_local_registry
-    # - identifier: >-
-    #     graphql_codegen_js_remove_codegen_android_remove_codegen_ios_add_codegen_android
-    #   buildspec: .codebuild/run_e2e_tests.yml
-    #   env:
-    #     compute-type: BUILD_GENERAL1_LARGE
-    #     variables:
-    #       TEST_SUITE: >-
-    #         src/__tests__/graphql-codegen-js.test.ts|src/__tests__/remove-codegen-android.test.ts|src/__tests__/remove-codegen-ios.test.ts|src/__tests__/add-codegen-android.test.ts
-    #       CLI_REGION: us-east-2
-    #   depend-on:
-    #     - publish_to_local_registry
-    # - identifier: >-
-    #     configure_codegen_ios_datastore_modelgen_android_datastore_modelgen_js_feature_flags
-    #   buildspec: .codebuild/run_e2e_tests.yml
-    #   env:
-    #     compute-type: BUILD_GENERAL1_LARGE
-    #     variables:
-    #       TEST_SUITE: >-
-    #         src/__tests__/configure-codegen-ios.test.ts|src/__tests__/datastore-modelgen-android.test.ts|src/__tests__/datastore-modelgen-js.test.ts|src/__tests__/feature-flags.test.ts
-    #       CLI_REGION: us-west-2
-    #   depend-on:
-    #     - publish_to_local_registry
-    # - identifier: >-
-    #     graphql_codegen_ios_add_codegen_js_datastore_modelgen_ios_remove_codegen_js
-    #   buildspec: .codebuild/run_e2e_tests.yml
-    #   env:
-    #     compute-type: BUILD_GENERAL1_LARGE
-    #     variables:
-    #       TEST_SUITE: >-
-    #         src/__tests__/graphql-codegen-ios.test.ts|src/__tests__/add-codegen-js.test.ts|src/__tests__/datastore-modelgen-ios.test.ts|src/__tests__/remove-codegen-js.test.ts
-    #       CLI_REGION: eu-west-2
-    #   depend-on:
-    #     - publish_to_local_registry
-    # - identifier: >-
-    #     datastore_modelgen_flutter_env_codegen_model_introspection_codegen_pull_codegen
-    #   buildspec: .codebuild/run_e2e_tests.yml
-    #   env:
-    #     compute-type: BUILD_GENERAL1_LARGE
-    #     variables:
-    #       TEST_SUITE: >-
-    #         src/__tests__/datastore-modelgen-flutter.test.ts|src/__tests__/env-codegen.test.ts|src/__tests__/model-introspection-codegen.test.ts|src/__tests__/pull-codegen.test.ts
-    #       CLI_REGION: eu-central-1
-    #   depend-on:
-    #     - publish_to_local_registry
-    # - identifier: >-
-    #     push_codegen_ios_push_codegen_android_graphql_documents_generator_push_codegen_js
-    #   buildspec: .codebuild/run_e2e_tests.yml
-    #   env:
-    #     compute-type: BUILD_GENERAL1_LARGE
-    #     variables:
-    #       TEST_SUITE: >-
-    #         src/__tests__/push-codegen-ios.test.ts|src/__tests__/push-codegen-android.test.ts|src/__tests__/graphql-documents-generator.test.ts|src/__tests__/push-codegen-js.test.ts
-    #       CLI_REGION: ap-southeast-1
-    #   depend-on:
-    #     - publish_to_local_registry
-    # - identifier: build_app_ts
-    #   buildspec: .codebuild/run_e2e_tests.yml
-    #   env:
-    #     compute-type: BUILD_GENERAL1_LARGE
-    #     variables:
-    #       TEST_SUITE: src/__tests__/build-app-ts.test.ts
-    #       CLI_REGION: ap-southeast-2
-    #   depend-on:
-    #     - publish_to_local_registry
+    - identifier: build_app_swift
+      buildspec: .codebuild/run_ios_modelgen_e2e_test.yml
+      env:
+        compute-type: BUILD_GENERAL1_LARGE
+        variables:
+          TEST_SUITE: src/__tests__/build-app-swift.test.ts
+          CLI_REGION: us-east-2
+      depend-on:
+        - publish_to_local_registry
+    - identifier: >-
+        add_codegen_ios_configure_codegen_android_configure_codegen_js_graphql_codegen_android
+      buildspec: .codebuild/run_e2e_tests.yml
+      env:
+        compute-type: BUILD_GENERAL1_LARGE
+        variables:
+          TEST_SUITE: >-
+            src/__tests__/add-codegen-ios.test.ts|src/__tests__/configure-codegen-android.test.ts|src/__tests__/configure-codegen-js.test.ts|src/__tests__/graphql-codegen-android.test.ts
+          CLI_REGION: us-east-1
+      depend-on:
+        - publish_to_local_registry
+    - identifier: >-
+        graphql_codegen_js_remove_codegen_android_remove_codegen_ios_add_codegen_android
+      buildspec: .codebuild/run_e2e_tests.yml
+      env:
+        compute-type: BUILD_GENERAL1_LARGE
+        variables:
+          TEST_SUITE: >-
+            src/__tests__/graphql-codegen-js.test.ts|src/__tests__/remove-codegen-android.test.ts|src/__tests__/remove-codegen-ios.test.ts|src/__tests__/add-codegen-android.test.ts
+          CLI_REGION: us-east-2
+      depend-on:
+        - publish_to_local_registry
+    - identifier: >-
+        configure_codegen_ios_datastore_modelgen_android_datastore_modelgen_js_feature_flags
+      buildspec: .codebuild/run_e2e_tests.yml
+      env:
+        compute-type: BUILD_GENERAL1_LARGE
+        variables:
+          TEST_SUITE: >-
+            src/__tests__/configure-codegen-ios.test.ts|src/__tests__/datastore-modelgen-android.test.ts|src/__tests__/datastore-modelgen-js.test.ts|src/__tests__/feature-flags.test.ts
+          CLI_REGION: us-west-2
+      depend-on:
+        - publish_to_local_registry
+    - identifier: >-
+        graphql_codegen_ios_add_codegen_js_datastore_modelgen_ios_remove_codegen_js
+      buildspec: .codebuild/run_e2e_tests.yml
+      env:
+        compute-type: BUILD_GENERAL1_LARGE
+        variables:
+          TEST_SUITE: >-
+            src/__tests__/graphql-codegen-ios.test.ts|src/__tests__/add-codegen-js.test.ts|src/__tests__/datastore-modelgen-ios.test.ts|src/__tests__/remove-codegen-js.test.ts
+          CLI_REGION: eu-west-2
+      depend-on:
+        - publish_to_local_registry
+    - identifier: >-
+        datastore_modelgen_flutter_env_codegen_model_introspection_codegen_pull_codegen
+      buildspec: .codebuild/run_e2e_tests.yml
+      env:
+        compute-type: BUILD_GENERAL1_LARGE
+        variables:
+          TEST_SUITE: >-
+            src/__tests__/datastore-modelgen-flutter.test.ts|src/__tests__/env-codegen.test.ts|src/__tests__/model-introspection-codegen.test.ts|src/__tests__/pull-codegen.test.ts
+          CLI_REGION: eu-central-1
+      depend-on:
+        - publish_to_local_registry
+    - identifier: >-
+        push_codegen_ios_push_codegen_android_graphql_documents_generator_push_codegen_js
+      buildspec: .codebuild/run_e2e_tests.yml
+      env:
+        compute-type: BUILD_GENERAL1_LARGE
+        variables:
+          TEST_SUITE: >-
+            src/__tests__/push-codegen-ios.test.ts|src/__tests__/push-codegen-android.test.ts|src/__tests__/graphql-documents-generator.test.ts|src/__tests__/push-codegen-js.test.ts
+          CLI_REGION: ap-southeast-1
+      depend-on:
+        - publish_to_local_registry
+    - identifier: build_app_ts
+      buildspec: .codebuild/run_e2e_tests.yml
+      env:
+        compute-type: BUILD_GENERAL1_LARGE
+        variables:
+          TEST_SUITE: src/__tests__/build-app-ts.test.ts
+          CLI_REGION: ap-southeast-2
+      depend-on:
+        - publish_to_local_registry
     - identifier: build_app_android
       buildspec: .codebuild/run_e2e_tests.yml
       env:
-        compute-type: BUILD_GENERAL1_MEDIUM
+        compute-type: BUILD_GENERAL1_LARGE
         variables:
           TEST_SUITE: src/__tests__/build-app-android.test.ts
-          CLI_REGION: us-east-2
-      debug-session: true
+          CLI_REGION: ap-northeast-1
       depend-on:
         - publish_to_local_registry
-    # - identifier: cleanup_e2e_resources
-    #   buildspec: .codebuild/cleanup_e2e_resources.yml
-    #   env:
-    #     compute-type: BUILD_GENERAL1_MEDIUM
-    #   depend-on:
-    #     - >-
-    #       add_codegen_ios_configure_codegen_android_configure_codegen_js_graphql_codegen_android
+    - identifier: cleanup_e2e_resources
+      buildspec: .codebuild/cleanup_e2e_resources.yml
+      env:
+        compute-type: BUILD_GENERAL1_MEDIUM
+      depend-on:
+        - >-
+          add_codegen_ios_configure_codegen_android_configure_codegen_js_graphql_codegen_android
diff --git a/scripts/split-e2e-tests-codebuild.ts b/scripts/split-e2e-tests-codebuild.ts
@@ -166,7 +166,7 @@ const splitTests = (
         tmp.env.variables.USE_PARENT_ACCOUNT = 1;
       }
       if (j.runSolo) {
-        tmp.env['compute-type'] = 'BUILD_GENERAL1_MEDIUM';
+        tmp.env['compute-type'] = 'BUILD_GENERAL1_LARGE';
       }
       result.push(tmp);
     }