ci: fix windows image

aws-amplify · Oct 23, 2023 · 36c71b9 · 36c71b9
1 parent b5957a2
commit 36c71b9
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 9 deletions.
diff --git a/.codebuild/e2e_workflow.yml b/.codebuild/e2e_workflow.yml
@@ -154,96 +154,96 @@ batch:
       buildspec: .codebuild/run_e2e_tests_windows.yml
       env:
         compute-type: BUILD_GENERAL1_LARGE
+        image: $WINDOWS_IMAGE_2019
         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
-      image: $WINDOWS_IMAGE_2019
     - identifier: >-
         w_graphql_codegen_js_remove_codegen_android_remove_codegen_ios_add_codegen_android
       buildspec: .codebuild/run_e2e_tests_windows.yml
       env:
         compute-type: BUILD_GENERAL1_LARGE
+        image: $WINDOWS_IMAGE_2019
         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
-      image: $WINDOWS_IMAGE_2019
     - identifier: >-
         w_configure_codegen_ios_datastore_modelgen_android_datastore_modelgen_js_feature_flags
       buildspec: .codebuild/run_e2e_tests_windows.yml
       env:
         compute-type: BUILD_GENERAL1_LARGE
+        image: $WINDOWS_IMAGE_2019
         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
-      image: $WINDOWS_IMAGE_2019
     - identifier: >-
         w_graphql_codegen_ios_add_codegen_js_datastore_modelgen_ios_remove_codegen_js
       buildspec: .codebuild/run_e2e_tests_windows.yml
       env:
         compute-type: BUILD_GENERAL1_LARGE
+        image: $WINDOWS_IMAGE_2019
         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
-      image: $WINDOWS_IMAGE_2019
     - identifier: >-
         w_datastore_modelgen_flutter_env_codegen_model_introspection_codegen_pull_codegen
       buildspec: .codebuild/run_e2e_tests_windows.yml
       env:
         compute-type: BUILD_GENERAL1_LARGE
+        image: $WINDOWS_IMAGE_2019
         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
-      image: $WINDOWS_IMAGE_2019
     - identifier: >-
         w_push_codegen_ios_push_codegen_android_graphql_documents_generator_push_codegen_js
       buildspec: .codebuild/run_e2e_tests_windows.yml
       env:
         compute-type: BUILD_GENERAL1_LARGE
+        image: $WINDOWS_IMAGE_2019
         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-northeast-1
       depend-on:
         - publish_to_local_registry
-      image: $WINDOWS_IMAGE_2019
     - identifier: >-
         w_build_app_ts_uninitialized_project_codegen_js_uninitialized_project_modelgen_android_uninitialized_project_modelgen_flutter
       buildspec: .codebuild/run_e2e_tests_windows.yml
       env:
         compute-type: BUILD_GENERAL1_LARGE
+        image: $WINDOWS_IMAGE_2019
         variables:
           TEST_SUITE: >-
             src/__tests__/build-app-ts.test.ts|src/__tests__/uninitialized-project-codegen-js.test.ts|src/__tests__/uninitialized-project-modelgen-android.test.ts|src/__tests__/uninitialized-project-modelgen-flutter.test.ts
           CLI_REGION: ap-southeast-1
       depend-on:
         - publish_to_local_registry
-      image: $WINDOWS_IMAGE_2019
     - identifier: w_uninitialized_project_modelgen_ios_uninitialized_project_modelgen_js
       buildspec: .codebuild/run_e2e_tests_windows.yml
       env:
         compute-type: BUILD_GENERAL1_LARGE
+        image: $WINDOWS_IMAGE_2019
         variables:
           TEST_SUITE: >-
             src/__tests__/uninitialized-project-modelgen-ios.test.ts|src/__tests__/uninitialized-project-modelgen-js.test.ts
           CLI_REGION: ap-southeast-2
       depend-on:
         - publish_to_local_registry
-      image: $WINDOWS_IMAGE_2019
     - identifier: cleanup_e2e_resources
       buildspec: .codebuild/cleanup_e2e_resources.yml
       env:

diff --git a/scripts/split-e2e-tests.ts b/scripts/split-e2e-tests.ts
@@ -205,9 +205,9 @@ function main(): void {
     buildspec: '.codebuild/run_e2e_tests_windows.yml',
     env: {
       'compute-type': 'BUILD_GENERAL1_LARGE',
+      image: '$WINDOWS_IMAGE_2019',
     },
     'depend-on': ['publish_to_local_registry'],
-    image: '$WINDOWS_IMAGE_2019',
   };
 
   const splitE2ETests = splitTests(