rm windows for codegen matrix

aws-amplify · Dec 1, 2023 · e8a5673 · e8a5673
1 parent e0fe69e
commit e8a5673
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 22 deletions.
diff --git a/.codebuild/e2e_workflow.yml b/.codebuild/e2e_workflow.yml
@@ -68,6 +68,16 @@ batch:
       debug-session: true
       depend-on:
         - publish_to_local_registry
+    - identifier: codegen_matrix
+      buildspec: .codebuild/run_e2e_tests.yml
+      env:
+        compute-type: BUILD_GENERAL1_LARGE
+        variables:
+          TEST_SUITE: src/__tests__/codegen-matrix.test.ts
+          CLI_REGION: ap-southeast-2
+      debug-session: true
+      depend-on:
+        - publish_to_local_registry
     - identifier: >-
         l_add_codegen_ios_configure_codegen_android_configure_codegen_js_graphql_codegen_android
       buildspec: .codebuild/run_e2e_tests.yml
@@ -152,15 +162,6 @@ batch:
         variables:
           TEST_SUITE: >-
             src/__tests__/uninitialized-project-modelgen-ios.test.ts|src/__tests__/uninitialized-project-modelgen-js.test.ts
-          CLI_REGION: us-east-1
-      depend-on:
-        - publish_to_local_registry
-    - identifier: l_codegen_matrix
-      buildspec: .codebuild/run_e2e_tests.yml
-      env:
-        compute-type: BUILD_GENERAL1_LARGE
-        variables:
-          TEST_SUITE: src/__tests__/codegen-matrix.test.ts
           CLI_REGION: ap-southeast-2
       depend-on:
         - publish_to_local_registry
@@ -275,18 +276,6 @@ batch:
       depend-on:
         - publish_to_local_registry
         - build_windows
-    - identifier: w_codegen_matrix
-      buildspec: .codebuild/run_e2e_tests_windows.yml
-      env:
-        compute-type: BUILD_GENERAL1_LARGE
-        image: $WINDOWS_IMAGE_2019
-        type: WINDOWS_SERVER_2019_CONTAINER
-        variables:
-          TEST_SUITE: src/__tests__/codegen-matrix.test.ts
-          CLI_REGION: us-east-1
-      depend-on:
-        - publish_to_local_registry
-        - build_windows
     - identifier: cleanup_e2e_resources
       buildspec: .codebuild/cleanup_e2e_resources.yml
       env:

diff --git a/.codebuild/e2e_workflow_base.yml b/.codebuild/e2e_workflow_base.yml
@@ -68,3 +68,13 @@ batch:
       debug-session: true
       depend-on:
         - publish_to_local_registry
+    - identifier: codegen_matrix
+      buildspec: .codebuild/run_e2e_tests.yml
+      env:
+        compute-type: BUILD_GENERAL1_LARGE
+        variables:
+          TEST_SUITE: src/__tests__/codegen-matrix.test.ts
+          CLI_REGION: ap-southeast-2
+      debug-session: true
+      depend-on:
+        - publish_to_local_registry
diff --git a/scripts/split-e2e-tests.ts b/scripts/split-e2e-tests.ts
@@ -22,10 +22,11 @@ const TEST_TIMINGS_PATH = join(REPO_ROOT, 'scripts', 'test-timings.data.json');
 const CODEBUILD_CONFIG_BASE_PATH = join(REPO_ROOT, '.codebuild', 'e2e_workflow_base.yml');
 const CODEBUILD_GENERATE_CONFIG_PATH = join(REPO_ROOT, '.codebuild', 'e2e_workflow.yml');
 const CODEBUILD_DEBUG_CONFIG_PATH = join (REPO_ROOT, '.codebuild', 'debug_workflow.yml');
-const RUN_SOLO = ['src/__tests__/codegen-matrix.test.ts'];
+const RUN_SOLO = [];
 const EXCLUDE_TESTS = [
   'src/__tests__/build-app-swift.test.ts',
   'src/__tests__/build-app-android.test.ts',
+  'src/__tests__/codegen-matrix.test.ts',
 ];
 const DEBUG_FLAG = '--debug';