From d702d180c05acd01a24903f5ece61f53bacd7b84 Mon Sep 17 00:00:00 2001
From: Bart Louwers <bart@emeel.net>
Date: Wed, 13 Nov 2024 12:12:38 +0100
Subject: [PATCH] Fix instrumentation tests, attempt 2 (#3014)

---
 .github/workflows/android-device-test.yml      |  1 +
 .github/workflows/ios-device-test.yml          |  9 +++++++++
 scripts/aws-device-farm/aws-device-farm-run.sh | 10 +++++-----
 3 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/android-device-test.yml b/.github/workflows/android-device-test.yml
index 263c4c76ae3..6c19057b957 100644
--- a/.github/workflows/android-device-test.yml
+++ b/.github/workflows/android-device-test.yml
@@ -134,6 +134,7 @@ jobs:
           aws-region: us-west-2
           role-to-assume: ${{ vars.OIDC_AWS_ROLE_TO_ASSUME }}
           role-session-name: ${{ github.run_id }}
+          role-duration-seconds: 14400
       
       - name: Run ${{ matrix.test.name }} on AWS Device Farm
         run: |
diff --git a/.github/workflows/ios-device-test.yml b/.github/workflows/ios-device-test.yml
index fc8bde6698c..df2bf6d8b27 100644
--- a/.github/workflows/ios-device-test.yml
+++ b/.github/workflows/ios-device-test.yml
@@ -49,6 +49,15 @@ jobs:
         with:
           files: "${{ matrix.test.xcTestFile }}, ${{ matrix.test.ipaFile }}"
 
+      - name: Configure AWS Credentials
+        if: env.run_device_test == 'true'
+        uses: aws-actions/configure-aws-credentials@v4
+        with:
+          aws-region: us-west-2
+          role-to-assume: ${{ vars.OIDC_AWS_ROLE_TO_ASSUME }}
+          role-session-name: ${{ github.run_id }}
+          role-duration-seconds: 14400
+
       - name: Run ${{ matrix.test.name }} on AWS Device Farm
         if: steps.check_files.outputs.files_exists == 'true'
         run: |
diff --git a/scripts/aws-device-farm/aws-device-farm-run.sh b/scripts/aws-device-farm/aws-device-farm-run.sh
index 9b76bb0f844..2348fa16dcd 100755
--- a/scripts/aws-device-farm/aws-device-farm-run.sh
+++ b/scripts/aws-device-farm/aws-device-farm-run.sh
@@ -67,10 +67,10 @@ while ((max_checks--)); do
   status_test_package="$status_test_package"
 
   if [[ "$status_app" == "SUCCEEDED" && "$status_test_package" == "SUCCEEDED" ]]; then
-    echo "Uploads succeeded"  >&2
+    echo "Uploads succeeded" >&2
     break
   elif ((max_checks == 0)); then
-    echo "App or test package failed to upload"  >&2
+    echo "App or test package failed to upload" >&2
     exit 1
   fi
 
@@ -100,9 +100,9 @@ while true; do
   sleep 30
   result="$(aws devicefarm get-run --arn "$arn" --output text --query "run.result")"
   case $result in
-    FAILED|ERRORED|STOPPED) echo "Run $result" && exit 1 ;;
-    SKIPPED|PASSED) echo "Run $result" && exit 0 ;;
+    FAILED|ERRORED|STOPPED) echo "Run $result" >&2 && exit 1 ;;
+    SKIPPED|PASSED) echo "Run $result" >&2 && exit 0 ;;
     PENDING) continue ;;
-    *) echo "Unexpected run result $result" && exit 1 ;;
+    *) echo "Unexpected run result $result" >&2 && exit 1 ;;
   esac
 done
\ No newline at end of file