diff options
| author | Albin <albin@mullvad.net> | 2025-02-10 09:47:01 +0100 |
|---|---|---|
| committer | Albin <albin@mullvad.net> | 2025-02-10 12:40:26 +0100 |
| commit | 35eb98b88b804d0da797a97325db708f5c1c5f54 (patch) | |
| tree | baa7a2781a32421c22af55e643beb918f1fd16c3 | |
| parent | 7cb1949626fea02b645efbf3d3ab2501f81a7fb4 (diff) | |
| download | mullvadvpn-35eb98b88b804d0da797a97325db708f5c1c5f54.tar.xz mullvadvpn-35eb98b88b804d0da797a97325db708f5c1c5f54.zip | |
Enable using per-runner e2e test account
| -rw-r--r-- | .github/workflows/android-app.yml | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/.github/workflows/android-app.yml b/.github/workflows/android-app.yml index b15d0bb042..42d4e04a5e 100644 --- a/.github/workflows/android-app.yml +++ b/.github/workflows/android-app.yml @@ -433,7 +433,7 @@ jobs: instrumented-e2e-tests: name: Run instrumented e2e tests # Temporary workaround for targeting the runner android-runner-v1 - runs-on: [self-hosted, android-device, android-emulator] + runs-on: [self-hosted, android-device] needs: [prepare, build-app, build-instrumented-tests] if: > github.event_name == 'schedule' || @@ -443,6 +443,16 @@ jobs: include: - test-repeat: ${{ needs.prepare.outputs.E2E_TEST_REPEAT || 1 }} steps: + - name: Resolve unique runner test account secret name + if: needs.prepare.outputs.E2E_TEST_INFRA_FLAVOR == 'prod' + run: | + echo "RUNNER_SECRET_NAME=ANDROID_PROD_TEST_ACCOUNT_$(echo $RUNNER_NAME | tr '[:lower:]-' '[:upper:]_')" \ + >> $GITHUB_ENV + + - name: Resolve runner test account + if: needs.prepare.outputs.E2E_TEST_INFRA_FLAVOR == 'prod' + run: echo "RESOLVED_TEST_ACCOUNT=${{ secrets[env.RUNNER_SECRET_NAME] }}" >> $GITHUB_ENV + - name: Prepare report dir if: ${{ matrix.test-repeat != 0 }} id: prepare-report-dir @@ -486,8 +496,7 @@ jobs: INFRA_FLAVOR: "${{ needs.prepare.outputs.E2E_TEST_INFRA_FLAVOR }}" PARTNER_AUTH: |- ${{ needs.prepare.outputs.E2E_TEST_INFRA_FLAVOR == 'stagemole' && secrets.STAGEMOLE_PARTNER_AUTH || '' }} - VALID_TEST_ACCOUNT_NUMBER: |- - ${{ needs.prepare.outputs.E2E_TEST_INFRA_FLAVOR == 'prod' && secrets.ANDROID_PROD_TEST_ACCOUNT || '' }} + VALID_TEST_ACCOUNT_NUMBER: ${{ env.RESOLVED_TEST_ACCOUNT }} INVALID_TEST_ACCOUNT_NUMBER: '0000000000000000' ENABLE_HIGHLY_RATE_LIMITED_TESTS: ${{ github.event_name == 'schedule' && 'true' || 'false' }} ENABLE_ACCESS_TO_LOCAL_API_TESTS: true |