diff options
| author | Albin <albin@mullvad.net> | 2024-08-19 12:46:49 +0200 |
|---|---|---|
| committer | Albin <albin@mullvad.net> | 2024-08-19 12:46:49 +0200 |
| commit | 3305d6aeb3018688dc4ab28ec60d5a990bb9d8fa (patch) | |
| tree | ecc00338159437299df39e4333716b6543356fd1 /.github/workflows | |
| parent | 58a811f70b0d9da7ad052ec98b25eff65ee4a1be (diff) | |
| parent | 69bce812c4d300a1d9e26c0086a5778da65e01da (diff) | |
| download | mullvadvpn-3305d6aeb3018688dc4ab28ec60d5a990bb9d8fa.tar.xz mullvadvpn-3305d6aeb3018688dc4ab28ec60d5a990bb9d8fa.zip | |
Merge branch 'unable-to-get-initilizationprovider-droid-1238'
Diffstat (limited to '.github/workflows')
| -rw-r--r-- | .github/workflows/android-app.yml | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/.github/workflows/android-app.yml b/.github/workflows/android-app.yml index 22a9935ea3..a8f76266eb 100644 --- a/.github/workflows/android-app.yml +++ b/.github/workflows/android-app.yml @@ -313,7 +313,7 @@ jobs: - uses: actions/download-artifact@v4 with: name: relay-list - path: android/app/build/extraAssets/relays.json + path: android/app/build/extraAssets - name: Build app uses: burrunan/gradle-cache-action@v1 @@ -416,10 +416,9 @@ jobs: - test-type: app path: android/app/build/outputs/apk test-repeat: 1 - # Disabled (test-repeat='0') due to flakiness unless overridden by input. - test-type: mockapi path: android/test/mockapi/build/outputs/apk - test-repeat: ${{ github.event.inputs.mockapi_test_repeat || 0 }} + test-repeat: ${{ github.event.inputs.mockapi_test_repeat || 1 }} steps: - name: Prepare report dir if: ${{ matrix.test-repeat != 0 }} @@ -470,7 +469,8 @@ jobs: instrumented-e2e-tests: name: Run instrumented e2e tests - runs-on: [self-hosted, android-device] + # Temporary workaround for targeting the runner android-runner-v1 + runs-on: [self-hosted, android-device, android-emulator] if: github.event_name == 'schedule' || github.event.inputs.run_e2e_tests == 'true' timeout-minutes: 30 needs: [build-app, build-instrumented-tests] @@ -507,6 +507,7 @@ jobs: INFRA_FLAVOR: prod VALID_TEST_ACCOUNT_NUMBER: ${{ secrets.ANDROID_PROD_TEST_ACCOUNT }} INVALID_TEST_ACCOUNT_NUMBER: '0000000000000000' + ENABLE_HIGHLY_RATE_LIMITED_TESTS: ${{ github.event_name == 'schedule' && 'true' || 'false' }} REPORT_DIR: ${{ steps.prepare-report-dir.outputs.report_dir }} run: ./android/scripts/run-instrumented-tests.sh @@ -521,6 +522,7 @@ jobs: clearPackageData=true,\ runnerBuilder=de.mannodermaus.junit5.AndroidJUnit5Builder,\ invalid_test_account_number=0000000000000000,\ + enable_highly_rate_limited_tests=${{ github.event_name == 'schedule' && 'true' || 'false' }},\ partner_auth=${{ secrets.STAGEMOLE_PARTNER_AUTH }}" strategy: fail-fast: false |