feat: add android e2e test

Author: phani-srikar

.codebuild/e2e_workflow.yml

@@ -37,6 +37,15 @@ batch:
           CLI_REGION: us-east-2
       depend-on:
         - publish_to_local_registry
+    - identifier: build_app_android
+      buildspec: .codebuild/run_android_modelgen_e2e_test.yml
+      env:
+        compute-type: BUILD_GENERAL1_LARGE
+        variables:
+          TEST_SUITE: src/__tests__/build-app-android.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
@@ -100,7 +109,7 @@ batch:
         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
+          CLI_REGION: ap-northeast-1
       depend-on:
         - publish_to_local_registry
     - identifier: build_app_ts
@@ -109,16 +118,7 @@ batch:
         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
-        variables:
-          TEST_SUITE: src/__tests__/build-app-android.test.ts
-          CLI_REGION: ap-northeast-1
+          CLI_REGION: ap-southeast-1
       depend-on:
         - publish_to_local_registry
     - identifier: cleanup_e2e_resources

.codebuild/e2e_workflow_base.yml

@@ -37,3 +37,12 @@ batch:
           CLI_REGION: us-east-2
       depend-on:
         - publish_to_local_registry
+    - identifier: build_app_android
+      buildspec: .codebuild/run_android_modelgen_e2e_test.yml
+      env:
+        compute-type: BUILD_GENERAL1_LARGE
+        variables:
+          TEST_SUITE: src/__tests__/build-app-android.test.ts
+          CLI_REGION: us-east-2
+      depend-on:
+        - publish_to_local_registry

.codebuild/run_android_modelgen_e2e_test.yml

@@ -0,0 +1,32 @@
+version: 0.2
+env:
+  shell: bash
+  variables:
+    AMPLIFY_DIR: /root/.npm-global/lib/node_modules/@aws-amplify/cli-internal/bin
+    AMPLIFY_PATH: /root/.npm-global/lib/node_modules/@aws-amplify/cli-internal/bin/amplify
+    CI: true
+    CODEBUILD: true
+    NODE_OPTIONS: --max-old-space-size=8096
+
+phases:
+  install:
+    commands:
+      - sudo apt update
+      - yes | sudo apt install android-sdk
+      - export ANDROID_HOME=/usr/lib/android-sdk
+      - yes | sudo apt install sdkmanager
+      # Review SDK licenses
+      - yes | sudo sdkmanager --licenses
+
+  build:
+    commands:
+      - source ./shared-scripts.sh && _runE2ETestsLinux
+  post_build:
+    commands:
+      - aws sts get-caller-identity
+      - source ./shared-scripts.sh && _scanArtifacts
+
+artifacts:
+  files:
+    - $CODEBUILD_SRC_DIR/packages/amplify-codegen-e2e-tests/amplify-e2e-reports/*
+  discard-paths: yes

packages/amplify-codegen-e2e-core/src/init/android.ts

@@ -25,4 +25,26 @@ export function androidBuild(cwd: string, settings: Object = {}): Promise<void>
       }
     });
   });
-}
+};
+
+export function acceptLicenses(cwd: string, settings: Object = {}): Promise<void> {
+  return new Promise((resolve, reject) => {
+    const s = { ...defaultSettings, ...settings };
+
+    const chain = spawn('sdkmanager', ['--licenses'], {
+      cwd,
+      stripColors: true,
+      disableCIDetection: s.disableCIDetection
+    })
+    .wait("Review licenses that have not been accepted (y/N)?")
+    .sendLine("y");
+
+    chain.run((err: Error) => {
+      if (err) {
+        reject(err);
+      } else {
+        resolve();
+      }
+    });
+  });
+};

packages/amplify-codegen-e2e-tests/package.json

@@ -17,7 +17,7 @@
   ],
   "private": true,
   "scripts": {
-    "e2e": "npm run setup-profile && jest --verbose",
+    "e2e": "npm run setup-profile && jest --verbose --forceExit",
     "setup-profile": "ts-node ./src/configure_tests.ts",
     "clean-e2e-resources": "ts-node ./src/cleanup-e2e-resources.ts",
     "clean-cb-e2e-resources": "ts-node ./src/cleanup-cb-e2e-resources.ts"

packages/amplify-codegen-e2e-tests/src/__tests__/build-app-android.test.ts

@@ -1,10 +1,10 @@
 import {
   initProjectWithQuickstart,
   DEFAULT_ANDROID_CONFIG,
-  addApiWithBlankSchemaAndConflictDetection,
   updateApiSchemaWithText,
   generateModels,
   androidBuild,
+  acceptLicenses
 } from '@aws-amplify/amplify-codegen-e2e-core';
 const { schemas } = require('@aws-amplify/graphql-schema-test-library');
 import { existsSync, writeFileSync, readdirSync, rmSync } from 'fs';
@@ -21,6 +21,7 @@ describe('build app - Android', () => {
   beforeAll(async () => {
     await initProjectWithQuickstart(projectRoot, { ...config });
     apiName = readdirSync(path.join(projectRoot, 'amplify', 'backend', 'api'))[0];
+    await acceptLicenses(projectRoot);
   });
 
   afterAll(async () => {

scripts/split-e2e-tests-codebuild.ts

@@ -21,11 +21,10 @@ const REPO_ROOT = join(__dirname, '..');
 const TEST_TIMINGS_PATH = join(REPO_ROOT, 'scripts', 'cci', '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 RUN_SOLO = [
-  'src/__tests__/build-app-android.test.ts',
-];
+const RUN_SOLO = [];
 const EXCLUDE_TESTS = [
   'src/__tests__/build-app-swift.test.ts',
+  'src/__tests__/build-app-android.test.ts',
 ];
 
 export function loadConfigBase() {
@@ -166,7 +165,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);
     }