separate e2e tests

Author: Krzysztof Borowy

.circleci/config.yml

@@ -117,6 +117,45 @@ cache:
     keys:
       - *key_pods
 
+
+# ==============================
+# COMMANDS
+# ==============================
+
+commands:
+  run_android_e2e:
+    parameters:
+      testScript:
+        type: string
+        default: test:e2e:android:next
+    steps:
+      - *addWorkspace
+      - run:
+          name: Start emulator in background
+          background: true
+          command: |
+            emulator -avd "Emu_E2E" \
+                -cores 1 \
+                -gpu auto \
+                -accel on \
+                -memory 1024 \
+                -no-audio \
+                -no-snapshot \
+                -no-boot-anim \
+                -no-window \
+                -logcat '*:E ReactNative:W ReactNativeJS:*'
+      - run:
+          name: Wait for emulator to boot
+          command: ./scripts/android_e2e.sh 'wait_for_emulator'
+      - run:
+          name: Wake device
+          command: |
+            adb shell input keyevent 82
+      - run:
+          name: Run e2e tests
+          command: yarn << parameters.testScript >>
+
+
 # ==============================
 # JOBS
 # ==============================
@@ -228,6 +267,17 @@ jobs:
             - example/android/app/build/outputs/apk/*
 
   "Test: Android e2e":
+    <<: *macos_defaults_android
+    steps:
+      - run_android_e2e:
+          testScript: "test:e2e:android"
+
+  "Test: Android e2e Next":
+    <<: *macos_defaults_android
+    steps:
+      - run_android_e2e
+
+  "Build: Prepare android e2e environment":
     <<: *macos_defaults_android
     steps:
       - *addWorkspace
@@ -257,13 +307,6 @@ jobs:
             yes | sdkmanager "build-tools;28.0.3" 1> /dev/null
             yes | sdkmanager --licenses 1> /dev/null
             yes | sdkmanager --list
-      - run:
-          name: ADB start/stop
-          command: |
-            adb start-server
-            adb devices
-            adb kill-server
-            ls -la ~/.android
       - run:
           name: Create emulator
           command: |
@@ -272,33 +315,9 @@ jobs:
                    -k "system-images;android-28;default;x86_64" \
                    -g "default" \
                    -d "pixel"
-      - run:
-          name: Start emulator in background
-          background: true
-          command: |
-            emulator -avd "Emu_E2E" \
-                -cores 1 \
-                -gpu auto \
-                -accel on \
-                -memory 1024 \
-                -no-audio \
-                -no-snapshot \
-                -no-boot-anim \
-                -no-window \
-                -logcat '*:E ReactNative:W ReactNativeJS:*'
-      - run:
-          name: Wait for emulator to boot
-          command: ./scripts/android_e2e.sh 'wait_for_emulator'
-      - run:
-          name: Wake device
-          command: |
-            adb shell input keyevent 82
-      - run:
-          name: Run e2e tests
-          command: yarn test:e2e:android
-      - run:
-          name: Run e2e tests for Next storage
-          command: yarn detox test -c android.emu.release.next --maxConcurrency 1
+      - persist_to_workspace:
+          root: .
+          paths: .
 
   Release:
     <<: *js_defaults
@@ -334,13 +353,20 @@ workflows:
             - "Test: lint"
             - "Test: flow"
             - "Test: Android unit"
-      - "Test: Android e2e":
+      - "Build: Prepare android e2e environment":
           requires:
             - "Build: Android release apk"
+      - "Test: Android e2e":
+          requires:
+            - "Build: Prepare android e2e environment"
+      - "Test: Android e2e Next":
+          requires:
+            - "Build: Prepare android e2e environment"
       - "Release":
           requires:
             - "Test: iOS e2e"
             - "Test: Android e2e"
+            - "Test: Android e2e Next"
           filters:
             branches:
               only: master

package.json

@@ -56,6 +56,7 @@
     "test:flow": "flow check",
     "test:lint": "eslint src/**/*.js example/**/*.js jest/*.js",
     "test:e2e:android": "detox test -c android.emu.release --maxConcurrency 1",
+    "test:e2e:android:next": "detox test -c android.emu.release.next --maxConcurrency 1",
     "test:e2e:ios": "detox test -c ios.sim.release --maxConcurrency 1",
     "test:e2e:macos": "scripts/macos_e2e.sh 'test'"
   },