Update Test Devices & other minor fixes (#1109)

Author: sunmou99

.github/workflows/integration_tests.yml

@@ -196,7 +196,6 @@ jobs:
  echo "matrix_os=$( python scripts/gha/print_matrix_configuration.py -w integration_tests ${TEST_MATRIX_PARAM} -k os -o "${{github.event.inputs.operating_systems}}")" >> $GITHUB_OUTPUT
  echo "matrix_arch_macos=$( python scripts/gha/print_matrix_configuration.py -w integration_tests ${TEST_MATRIX_PARAM} -k architecture_macos)" >> $GITHUB_OUTPUT
  echo "matrix_arch_windows_linux=$( python scripts/gha/print_matrix_configuration.py -w integration_tests ${TEST_MATRIX_PARAM} -k architecture_windows_linux)" >> $GITHUB_OUTPUT
-
  # Combine architecture_macos and architecture_windows_linux to get a list of all architectures for the build matrix.
  matrix_arch_combined=`echo $( python scripts/gha/print_matrix_configuration.py -w integration_tests ${TEST_MATRIX_PARAM} -k architecture_macos | sed 's/[]\[,]//g') \
  $( python scripts/gha/print_matrix_configuration.py -w integration_tests ${TEST_MATRIX_PARAM} -k architecture_windows_linux | sed 's/[]\[,]//g' ) \
@@ -219,7 +218,6 @@ jobs:
  echo "xcode_version=$( python scripts/gha/print_matrix_configuration.py -w integration_tests ${TEST_MATRIX_PARAM} -k xcode_version)" >> $GITHUB_OUTPUT
  echo "ios_device=$( python scripts/gha/print_matrix_configuration.py -w integration_tests ${TEST_MATRIX_PARAM} -k ios_device -t ${mobile_test_on} )" >> $GITHUB_OUTPUT
  echo "tvos_device=$( python scripts/gha/print_matrix_configuration.py -w integration_tests ${TEST_MATRIX_PARAM} -k tvos_device -t ${mobile_test_on} )" >> $GITHUB_OUTPUT
-
  - name: Update PR label and comment
  if: steps.set_outputs.outputs.pr_number
  shell: bash
@@ -1043,7 +1041,7 @@ jobs:
  max_attempts: 3
  validator: ${GITHUB_WORKSPACE}/scripts/gha/integration_testing/ftl_gha_validator.py
  - name: Read FTL Test Result
- if: steps.device-info.outputs.device_type == 'real'
+ if: ${{ steps.device-info.outputs.device_type == 'real' && !cancelled() }}
  shell: bash
  run: |
  python scripts/gha/read_ftl_test_result.py --test_result '${{ steps.ftl_test.outputs.test_summary }}' \
@@ -1186,7 +1184,7 @@ jobs:
  max_attempts: 3
  validator: ${GITHUB_WORKSPACE}/scripts/gha/integration_testing/ftl_gha_validator.py
  - name: Read FTL Test Result
- if: steps.device-info.outputs.device_type == 'real'
+ if: ${{ steps.device-info.outputs.device_type == 'real' && !cancelled() }}
  shell: bash
  run: |
  python scripts/gha/read_ftl_test_result.py --test_result '${{ steps.ftl_test.outputs.test_summary }}' \

scripts/gha/github.py

@@ -31,6 +31,7 @@
 BACKOFF = 5
 RETRY_STATUS = (403, 500, 502, 504)
 TIMEOUT = 5
+TIMEOUT_LONG = 20
 
 OWNER = 'firebase'
 REPO = 'firebase-cpp-sdk'
@@ -236,9 +237,9 @@ def list_workflows(token, workflow_id, branch):
  """https://docs.github.com/en/rest/reference/actions#list-workflow-runs-for-a-repository"""
  url = f'{GITHUB_API_URL}/actions/workflows/{workflow_id}/runs'
  headers = {'Accept': 'application/vnd.github.v3+json', 'Authorization': f'token {token}'}
- data = {'event': 'workflow_dispatch', 'branch': branch}
+ data = {'event': 'workflow_dispatch', 'branch': branch, 'per_page': 5}
  with requests.get(url, headers=headers, data=json.dumps(data),
- stream=True, timeout=TIMEOUT) as response:
+ stream=True, timeout=TIMEOUT_LONG) as response:
  logging.info("list_workflows: %s response: %s", url, response)
  return response.json()
 

scripts/gha/print_matrix_configuration.py

@@ -166,7 +166,7 @@
 # gcloud firebase test ios models list
 TEST_DEVICES = {
  "android_min": {"type": "real", "device": "model=Nexus10,version=19"},
- "android_target": {"type": "real", "device": "model=gts4lltevzw,version=28"},
+ "android_target": {"type": "real", "device": "model=blueline,version=28"},
  "android_latest": {"type": "real", "device": "model=oriole,version=33"},
  "emulator_min": {"type": "virtual", "image":"system-images;android-18;google_apis;x86"},
  "emulator_target": {"type": "virtual", "image":"system-images;android-30;google_apis;x86_64"},