summaryrefslogtreecommitdiffhomepage
path: root/.github/workflows
diff options
context:
space:
mode:
authorNiklas Berglund <niklas.berglund@gmail.com>2024-08-20 17:03:35 +0200
committerAlbin <albin@mullvad.net>2024-08-22 11:22:02 +0200
commit0b930562474d83af619ac18e2cc35abcb6952d38 (patch)
treea145c60b384d55a0c75174d38264735a719f87e7 /.github/workflows
parent05f4af68182f6d78a4e5fc1fe07514c328eb7e33 (diff)
downloadmullvadvpn-0b930562474d83af619ac18e2cc35abcb6952d38.tar.xz
mullvadvpn-0b930562474d83af619ac18e2cc35abcb6952d38.zip
Set e2e and mockapi timeout based on repeats
Diffstat (limited to '.github/workflows')
-rw-r--r--.github/workflows/android-app.yml13
1 files changed, 12 insertions, 1 deletions
diff --git a/.github/workflows/android-app.yml b/.github/workflows/android-app.yml
index 97ec390c9e..93532d7acc 100644
--- a/.github/workflows/android-app.yml
+++ b/.github/workflows/android-app.yml
@@ -423,7 +423,6 @@ jobs:
- name: Prepare report dir
if: ${{ matrix.test-repeat != 0 }}
id: prepare-report-dir
- timeout-minutes: 5
env:
INNER_REPORT_DIR: /tmp/${{ matrix.test-type }}-${{ github.run_id }}-${{ github.run_attempt }}
run: |
@@ -448,8 +447,14 @@ jobs:
name: ${{ matrix.test-type }}-instrumentation-apks
path: ${{ matrix.path }}
+ - name: Calculate timeout
+ id: calculate-timeout
+ run: echo "timeout=$(( ${{ matrix.test-repeat }} * 10 ))" >> $GITHUB_OUTPUT
+ shell: bash
+
- name: Run instrumented test script
if: ${{ matrix.test-repeat != 0 }}
+ timeout-minutes: ${{ fromJSON(steps.calculate-timeout.outputs.timeout) }}
shell: bash -ieo pipefail {0}
env:
AUTO_FETCH_TEST_HELPER_APKS: true
@@ -506,8 +511,14 @@ jobs:
name: e2e-instrumentation-apks
path: android/test/e2e/build/outputs/apk
+ - name: Calculate timeout
+ id: calculate-timeout
+ run: echo "timeout=$(( ${{ matrix.test-repeat }} * 10 ))" >> $GITHUB_OUTPUT
+ shell: bash
+
- name: Run instrumented test script
if: ${{ matrix.test-repeat != 0 }}
+ timeout-minutes: ${{ fromJSON(steps.calculate-timeout.outputs.timeout) }}
shell: bash -ieo pipefail {0}
env:
AUTO_FETCH_TEST_HELPER_APKS: true