Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: removed migration tests between versions of Gen 1 #14062

Merged
merged 7 commits into from
Jan 10, 2025
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
46 changes: 0 additions & 46 deletions codebuild_specs/migration_tests_v12.yml

This file was deleted.

46 changes: 0 additions & 46 deletions codebuild_specs/migration_tests_v8.yml

This file was deleted.

9 changes: 0 additions & 9 deletions codebuild_specs/wait_for_ids.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,6 @@
"l_api_4_containers_api_secrets_storage_4",
"l_api_6a_auth_7b_export_pull_b",
"l_api_7_export_pull_a_function_9a",
"l_api_key_migration_2_v8",
"l_api_key_migration_v8",
"l_apigw_api_lambda_auth_1_api_key_migration2",
"l_auth_12_auth_2g_auth_2h",
"l_auth_1a_auth_trigger_custom_policies_function",
Expand All @@ -25,14 +23,7 @@
"l_auth_5g_admin_api_hosted_ui",
"l_auth_7a_auth_8c_feature_flags",
"l_auth_9_custom_resources_env_5",
"l_auth_app_client_secret_migration_v12",
"l_auth_hosted_ui_lambda_migration_1_v12",
"l_auth_hosted_ui_lambda_migration_2_v12",
"l_auth_lambda_callout_migration_rollback_v12",
"l_auth_lambda_callout_migration_v12",
"l_auth_migration_amplify_remove_api_2a",
"l_auth_migration_v12",
"l_auth_oauth_lambda_migration_v12",
"l_build_function_custom_resource_with_storage_dynamodb_simulator",
"l_container_hosting_init_b_notifications_apns",
"l_containers_api_1",
Expand Down
15 changes: 0 additions & 15 deletions scripts/split-e2e-test-filters.ts
Original file line number Diff line number Diff line change
@@ -1,15 +0,0 @@
export const migrationFromV8Tests = [
'src/__tests__/migration_tests/transformer_migration/api.key.migration-2.test.ts',
'src/__tests__/migration_tests/transformer_migration/api.key.migration.test.ts',
];

export const migrationFromV12Tests = [
'src/__tests__/migration_tests_v12/auth.migration.test.ts',
'src/__tests__/migration_tests_v12/auth-app-client-secret-migration.test.ts',
'src/__tests__/migration_tests_v12/auth-hosted-ui-lambda-migration-1.test.ts',
'src/__tests__/migration_tests_v12/auth-hosted-ui-lambda-migration-2.test.ts',
'src/__tests__/migration_tests_v12/auth-lambda-callout-migration.test.ts',
'src/__tests__/migration_tests_v12/auth-lambda-callout-migration-rollback.test.ts',
'src/__tests__/migration_tests_v12/auth-oauth-lambda-migration.test.ts',
'src/__tests__/migration_tests_v12/auth-role-mapping-migration-test.ts',
];
31 changes: 1 addition & 30 deletions scripts/split-e2e-tests-codebuild.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ import { join } from 'path';
import * as yaml from 'js-yaml';
import { REPO_ROOT } from './cci-utils';
import { FORCE_REGION_MAP, getOldJobNameWithoutSuffixes, loadTestTimings, USE_PARENT_ACCOUNT } from './cci-utils';
import { migrationFromV12Tests, migrationFromV8Tests } from './split-e2e-test-filters';
const CODEBUILD_CONFIG_BASE_PATH = join(REPO_ROOT, 'codebuild_specs', 'e2e_workflow_base.yml');
const CODEBUILD_GENERATE_CONFIG_PATH = join(REPO_ROOT, 'codebuild_specs', 'e2e_workflow_generated');
const RUN_SOLO = [
Expand Down Expand Up @@ -329,36 +328,8 @@ function main(): void {
false,
undefined,
);
const splitMigrationV8Tests = splitTestsV3(
{
identifier: 'migration_tests_v8',
buildspec: 'codebuild_specs/migration_tests_v8.yml',
env: {},
'depend-on': ['upb'],
},
undefined,
join(REPO_ROOT, 'packages', 'amplify-migration-tests'),
true,
(tests: string[]) => {
return tests.filter((testName) => migrationFromV8Tests.find((t: string) => t === testName));
},
);
const splitMigrationV12Tests = splitTestsV3(
{
identifier: 'migration_tests_v12',
buildspec: 'codebuild_specs/migration_tests_v12.yml',
env: {},
'depend-on': ['upb'],
},
undefined,
join(REPO_ROOT, 'packages', 'amplify-migration-tests'),
true,
(tests: string[]) => {
return tests.filter((testName) => migrationFromV12Tests.find((t) => t === testName));
},
);

let allBuilds = [...splitE2ETests, ...splitMigrationV8Tests, ...splitMigrationV12Tests];
let allBuilds = [...splitE2ETests];
const dependeeIdentifiers: string[] = allBuilds.map((buildObject) => buildObject.identifier).sort();
const dependeeIdentifiersFileContents = `${JSON.stringify(dependeeIdentifiers, null, 2)}\n`;
const waitForIdsFilePath = './codebuild_specs/wait_for_ids.json';
Expand Down
Loading