From 9c88aaf70ce5637ca6cf06e1f5a0548c8ab07ea4 Mon Sep 17 00:00:00 2001 From: Jon Simantov Date: Wed, 18 Oct 2023 13:21:23 -0700 Subject: [PATCH] Remove changes made for debugging. --- .github/workflows/integration_tests.yml | 5 ++--- scripts/gha/print_matrix_configuration.py | 1 - 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/.github/workflows/integration_tests.yml b/.github/workflows/integration_tests.yml index 3063307f68..476992a491 100644 --- a/.github/workflows/integration_tests.yml +++ b/.github/workflows/integration_tests.yml @@ -1038,7 +1038,7 @@ jobs: - id: ftl_test if: steps.device-info.outputs.device_type == 'ftl' uses: FirebaseExtended/github-actions/firebase-test-lab@v1.3 - timeout-minutes: 20 + timeout-minutes: 90 with: credentials_json: ${{ secrets.FIREBASE_SERVICE_ACCOUNT_CREDENTIALS }} testapp_dir: testapps @@ -1417,7 +1417,7 @@ jobs: name: "attempt-retry" needs: [check_and_prepare, summarize_results] runs-on: ubuntu-20.04 - if: ${{ failure() }} # && needs.check_and_prepare.outputs.trigger == 'scheduled_trigger' + if: ${{ failure() && needs.check_and_prepare.outputs.trigger == 'scheduled_trigger' }} steps: - uses: actions/checkout@v3 with: @@ -1439,7 +1439,6 @@ jobs: run: | echo "::warning ::Attempting to retry failed tests" python scripts/gha/trigger_workflow.py -t ${{ steps.generate-token.outputs.token }} \ - -w retry-test-failures.yml \ -p run_id ${{ github.run_id }} \ -s 10 \ -b retry_test_failures \ diff --git a/scripts/gha/print_matrix_configuration.py b/scripts/gha/print_matrix_configuration.py index 8748dda95b..581aba5df1 100644 --- a/scripts/gha/print_matrix_configuration.py +++ b/scripts/gha/print_matrix_configuration.py @@ -178,7 +178,6 @@ {"type": "ftl", "device": "model=gts3lltevzw,version=28"}, # Galaxy Tab S3 {"type": "ftl", "device": "model=SH-01L,version=28"}, # AQUOS sense2 SH-01L {"type": "ftl", "device": "model=PD1901,version=28"}, # VIVO 1901 - {"type": "ftl", "device": "model=vivo_1906,version=28"}, # vivo 1906 - BROKEN ], "android_latest": [ {"type": "ftl", "device": "model=oriole,version=33"}, # Pixel 6