chore: reduce size of generated e2e buildspec (#12686)

* chore: noop trigger cb * chore: move compute type for migration tests to specific buildspec files * chore: shoreten upload_pkg_binaries identifier to reduce buildspec size
aws-amplify · May 25, 2023 · 0dce156 · 0dce156
1 parent e93c218
commit 0dce156
Show file tree

Hide file tree

Showing 7 changed files with 543 additions and 1,037 deletions.
diff --git a/codebuild_specs/e2e_workflow_base.yml b/codebuild_specs/e2e_workflow_base.yml
@@ -80,7 +80,7 @@ batch:
         compute-type: BUILD_GENERAL1_LARGE
       depend-on:
         - publish_to_local_registry
-    - identifier: upload_pkg_binaries
+    - identifier: upb
       buildspec: codebuild_specs/upload_pkg_binaries.yml
       env:
         compute-type: BUILD_GENERAL1_LARGE

diff --git a/codebuild_specs/e2e_workflow_generated.yml b/codebuild_specs/e2e_workflow_generated.yml
diff --git a/codebuild_specs/migration_tests_v10.yml b/codebuild_specs/migration_tests_v10.yml
@@ -1,6 +1,7 @@
 version: 0.2
 env:
   shell: bash
+  compute-type: BUILD_GENERAL1_SMALL
   variables:
     CI: true
     CIRCLECI: true

diff --git a/codebuild_specs/migration_tests_v5.yml b/codebuild_specs/migration_tests_v5.yml
@@ -1,6 +1,7 @@
 version: 0.2
 env:
   shell: bash
+  compute-type: BUILD_GENERAL1_SMALL
   variables:
     CI: true
     CIRCLECI: true

diff --git a/codebuild_specs/migration_tests_v6.yml b/codebuild_specs/migration_tests_v6.yml
@@ -1,6 +1,7 @@
 version: 0.2
 env:
   shell: bash
+  compute-type: BUILD_GENERAL1_SMALL
   variables:
     CI: true
     CIRCLECI: true

diff --git a/codebuild_specs/run_e2e_tests_windows.yml b/codebuild_specs/run_e2e_tests_windows.yml
@@ -1,6 +1,8 @@
 version: 0.2
 env:
   shell: powershell.exe
+  type: WINDOWS_SERVER_2019_CONTAINER
+  image: $WINDOWS_IMAGE_2019
   variables:
     CLI_REGION: us-east-1
     TEST_SUITE: src/__tests__/auth_2a.test.ts|src/__tests__/auth_2b.test.ts|src/__tests__/auth_2d.test.ts|src/__tests__/auth_2f.test.ts

diff --git a/scripts/split-e2e-tests-codebuild.ts b/scripts/split-e2e-tests-codebuild.ts
@@ -100,7 +100,7 @@ export function loadConfigBase() {
   return yaml.load(fs.readFileSync(CODEBUILD_CONFIG_BASE_PATH, 'utf8'));
 }
 export function saveConfig(config: any): void {
-  const output = ['# auto generated file. DO NOT EDIT manually', yaml.dump(config, { noRefs: true })];
+  const output = ['# auto generated file. DO NOT EDIT manually', yaml.dump(config, { noRefs: true, lineWidth: -1 })];
   fs.writeFileSync(`${CODEBUILD_GENERATE_CONFIG_PATH}.yml`, output.join('\n'));
 }
 function getTestFiles(dir: string, pattern = 'src/**/*.test.ts'): string[] {
@@ -110,7 +110,7 @@ type COMPUTE_TYPE = 'BUILD_GENERAL1_MEDIUM' | 'BUILD_GENERAL1_LARGE';
 type BatchBuildJob = {
   identifier: string;
   env: {
-    'compute-type': COMPUTE_TYPE;
+    'compute-type'?: COMPUTE_TYPE;
     variables: [string: string];
   };
 };
@@ -271,7 +271,7 @@ const splitTestsV3 = (
         variables: { WAIT_FOR_IDS_FILE_PATH: waitForIdsFilePath },
       },
       buildspec: 'codebuild_specs/aggregate_e2e_reports.yml',
-      'depend-on': ['upload_pkg_binaries'],
+      'depend-on': ['upb'],
     };
     result.push(reportsAggregator);
   }
@@ -285,20 +285,14 @@ function main(): void {
     {
       identifier: 'run_e2e_tests_linux',
       buildspec: 'codebuild_specs/run_e2e_tests_linux.yml',
-      env: {
-        'compute-type': 'BUILD_GENERAL1_MEDIUM',
-      },
-      'depend-on': ['upload_pkg_binaries'],
+      env: {},
+      'depend-on': ['upb'],
     },
     {
       identifier: 'run_e2e_tests_windows',
       buildspec: 'codebuild_specs/run_e2e_tests_windows.yml',
-      env: {
-        type: 'WINDOWS_SERVER_2019_CONTAINER',
-        'compute-type': 'BUILD_GENERAL1_MEDIUM',
-        image: '$WINDOWS_IMAGE_2019',
-      },
-      'depend-on': ['build_windows', 'upload_pkg_binaries'],
+      env: {},
+      'depend-on': ['build_windows', 'upb'],
     },
     join(REPO_ROOT, 'packages', 'amplify-e2e-tests'),
     false,
@@ -309,10 +303,8 @@ function main(): void {
     {
       identifier: 'migration_tests_v5',
       buildspec: 'codebuild_specs/migration_tests_v5.yml',
-      env: {
-        'compute-type': 'BUILD_GENERAL1_SMALL',
-      },
-      'depend-on': ['upload_pkg_binaries'],
+      env: {},
+      'depend-on': ['upb'],
     },
     undefined,
     join(REPO_ROOT, 'packages', 'amplify-migration-tests'),
@@ -325,10 +317,8 @@ function main(): void {
     {
       identifier: 'migration_tests_v6',
       buildspec: 'codebuild_specs/migration_tests_v6.yml',
-      env: {
-        'compute-type': 'BUILD_GENERAL1_SMALL',
-      },
-      'depend-on': ['upload_pkg_binaries'],
+      env: {},
+      'depend-on': ['upb'],
     },
     undefined,
     join(REPO_ROOT, 'packages', 'amplify-migration-tests'),
@@ -341,10 +331,8 @@ function main(): void {
     {
       identifier: 'migration_tests_v10',
       buildspec: 'codebuild_specs/migration_tests_v10.yml',
-      env: {
-        'compute-type': 'BUILD_GENERAL1_SMALL',
-      },
-      'depend-on': ['upload_pkg_binaries'],
+      env: {},
+      'depend-on': ['upb'],
     },
     undefined,
     join(REPO_ROOT, 'packages', 'amplify-migration-tests'),