Run simple-server as a Github Actions service

.github/docker/simple-server.compose.yml

@@ -32,3 +32,9 @@ services:
       CALL_SESSION_REDIS_HOST: redis
       RAILS_CACHE_REDIS_URL: redis://
       SIDEKIQ_REDIS_HOST: redis
+
+networks:
+  default:
+    driver: bridge
+    driver_opts:
+      com.docker.network.bridge.host_binding_ipv4: "127.0.0.1"

.github/scripts/wait_for_simple_server.sh

@@ -0,0 +1,41 @@
+#!/bin/bash
+
+# There's a possibility the Simple Server takes a while to come on, and is not
+# ready when the Android integration tests need it. This implements a wait loop
+# for 5 minutes — we shouldn't be waiting for longer than this — to check if we
+# can ping a particular URL on the server for a healthcheck.
+# 
+# A good example is to ping for the manifest and check if we get a 200
+#
+#     ./wait_for_simple_server.sh http://<simple-server-host>/api/manifest.json 200
+
+# Accept two arguments without assuming sane defaults
+if [ "$#" -ne 2 ]; then
+  echo "Usage: $0 <endpoint_url> <status_code>"
+  exit 1
+fi
+
+endpoint=$1
+desired_status=$2
+timeout=300
+start_time=$(date +%s)
+
+while true; do
+  status=$(curl -o /dev/null -s -w "%{http_code}\n" "$endpoint")
+
+  if [ "$status" -eq "$desired_status" ]; then
+    echo "Endpoint is up and running with status $desired_status."
+    break
+  else
+    echo "Current status: $status. Retrying..."
+    # Wait for a few seconds before retrying
+    sleep 5
+  fi
+
+  current_time=$(date +%s)
+  elapsed_time=$((current_time - start_time))
+  if [ "$elapsed_time" -ge "$timeout" ]; then
+    echo "Timeout reached. Exiting with failure."
+    exit 1
+  fi
+done

.github/workflows/ci_checks_v2.yml

@@ -0,0 +1,107 @@
+name: CI V2
+on:
+  pull_request:
+concurrency:
+  group: ci-v2-${{ github.head_ref }}
+  cancel-in-progress: true
+jobs:
+  integration-test:
+    runs-on:
+      - ubuntu-latest
+    env:
+      AVD_API_LEVEL: 34
+      AVD_ARCH: x86_64
+    steps:
+      - name: Enable KVM group perms
+        run: |
+          echo 'KERNEL=="kvm", GROUP="kvm", MODE="0666", OPTIONS+="static_node=kvm"' | sudo tee /etc/udev/rules.d/99-kvm4all.rules
+          sudo udevadm control --reload-rules
+          sudo udevadm trigger --name-match=kvm
+
+      - name: Checkout Android source
+        uses: actions/checkout@v4
+
+      - name: Start Simple Service
+        run: |
+          docker compose -f ".github/docker/simple-server.compose.yml" up -d
+          sleep 2
+          docker ps
+
+
+      - name: Cache AVD
+        uses: actions/cache@v4
+        id: avd-cache
+        with:
+          path: |
+            ~/.android/avd/*
+            ~/.android/adb*
+          key: ${{ runner.os }}-avd-${{ env.AVD_API_LEVEL }}-${{ env.AVD_ARCH }}
+
+      - name: create AVD and generate snapshot for caching
+        if: steps.avd-cache.outputs.cache-hit != 'true'
+        uses: reactivecircus/android-emulator-runner@v2
+        with:
+          api-level: ${{ env.AVD_API_LEVEL }}
+          arch: ${{ env.AVD_ARCH }}
+          force-avd-creation: false
+          emulator-options: -no-window -gpu swiftshader_indirect -noaudio -no-boot-anim -camera-back none
+          disable-animations: false
+          disk-size: 8G
+          script: echo "Generated AVD snapshot for caching."
+
+      - name: set up JDK
+        uses: actions/setup-java@v4
+        with:
+          distribution: 'zulu'
+          java-version: 17
+          cache: 'gradle'
+
+      - name: Build QA Test Artifacts
+        id: build-instrumented-tests
+        env:
+          SIMPLE_SERVER_HOST: http://127.0.0.1:8420
+        run: |
+          ./gradlew --build-cache --no-daemon -PmanifestEndpoint=${{ env.SIMPLE_SERVER_HOST }}/api/ assembleQaDebug assembleQaDebugAndroidTest
+
+      # - name: Check connectivity to server container
+      #   run: |
+      #     curl -I http://127.0.0.1:8420
+      #     docker exec -it $(docker ps -q -f name=server) curl -I http://server:3000
+
+      - name: Ensure the Simple Server is running
+        id: ensure-healthy-simple
+        env:
+          SIMPLE_SERVER_HOST: http://127.0.0.1:8420
+        run: .github/scripts/wait_for_simple_server.sh ${{ env.SIMPLE_SERVER_HOST }}/api/manifest.json 200
+
+      - name: QA Android Tests
+        id: run-instrumented-tests
+        uses: reactivecircus/android-emulator-runner@v2
+        with:
+          api-level: ${{ env.AVD_API_LEVEL }}
+          arch: ${{ env.AVD_ARCH }}
+          force-avd-creation: false
+          emulator-options: -no-snapshot-save -no-window -gpu swiftshader_indirect -noaudio -no-boot-anim -camera-back none
+          disable-animations: true
+          disk-size: 8G
+          script: |
+            adb root
+            mkdir -p app/build/outputs/test-artifacts
+            adb install app/build/outputs/apk/qa/debug/app-qa-debug.apk 
+            adb install app/build/outputs/apk/androidTest/qa/debug/app-qa-debug-androidTest.apk
+            adb shell am instrument -w -e filter org.simple.clinic.benchmark.SelectBenchmarkTests -e benchmark_app_performance false  org.simple.clinic.qa.debug.test/org.simple.clinic.AndroidTestJUnitRunner >app/build/outputs/test-artifacts/logs.txt 2>app/build/outputs/test-artifacts/logs.txt
+            cat app/build/outputs/test-artifacts/logs.txt
+            adb pull /storage/emulated/0/Android/data/org.simple.clinic.qa.debug/ app/build/outputs/test-artifacts/ || true
+            adb uninstall org.simple.clinic.qa.debug
+            adb uninstall org.simple.clinic.qa.debug.test
+            ! grep -q "FAILURES\!\!\!" app/build/outputs/test-artifacts/logs.txt
+
+      - name: Stop Simple Service
+        run: |
+          docker compose -f ".github/docker/simple-server.compose.yml" down
+      - name: Upload failed test artifacts
+        if: always() && steps.run-instrumented-tests.outcome != 'success'
+        uses: actions/upload-artifact@v4
+        with:
+          name: failed-test-artifacts
+          path: app/build/outputs/test-artifacts

simple-server.ci.yml

@@ -0,0 +1,42 @@
+version: "3"
+
+services:
+  postgres:
+    image: postgres:14.3-alpine
+    environment:
+      - POSTGRES_USER=postgres
+      - POSTGRES_PASSWORD=password
+    volumes:
+      - postgresqldata:/var/lib/postgresql/data
+    expose:
+      - "5432"
+
+  redis:
+    image: redis:5-alpine
+    expose:
+      - "6379"
+    volumes:
+      - redisdata:/data
+
+  server:
+    image: simpledotorg/server:latest
+    command: bash -c "rm -f tmp/pids/server.pid && bundle exec rake db:setup; bundle exec rails s -p 3000 -b '0.0.0.0'"
+    expose:
+      - "3000"
+    ports:
+      - "8420:3000"
+    depends_on:
+      - redis
+      - postgres
+    environment:
+      SIMPLE_SERVER_DATABASE_HOST: postgres
+      SIMPLE_SERVER_DATABASE_USERNAME: postgres
+      SIMPLE_SERVER_DATABASE_PASSWORD: password
+      SIMPLE_SERVER_HOST_PROTOCOL: https
+      CALL_SESSION_REDIS_HOST: redis
+      RAILS_CACHE_REDIS_URL: redis://
+      SIDEKIQ_REDIS_HOST: redis
+
+volumes:
+  postgresqldata:
+  redisdata: