test linux fix

aws · Dec 7, 2024 · fb29626 · fb29626
1 parent 90cffce
commit fb29626
Show file tree

Hide file tree

Showing 9 changed files with 54 additions and 55 deletions.
diff --git a/.github/actions/setup-integration-test/action.yml b/.github/actions/setup-integration-test/action.yml
@@ -71,6 +71,4 @@ runs:
       shell: bash
       if: runner.os == 'Linux'
       run: |
-          sudo echo "127.0.0.1 testsite" | sudo tee -a /etc/hosts
-
-      
+          sudo echo "127.0.0.1 testsite" | sudo tee -a /etc/hosts
diff --git a/.github/workflows/browser-compatibility-test-previous-major-version.yml b/.github/workflows/browser-compatibility-test-previous-major-version.yml
@@ -14,7 +14,8 @@ env:
   SAUCE_ACCESS_KEY: ${{secrets.SAUCE_ACCESS_KEY}}
   MESSAGING_USER_ARN: ${{secrets.MESSAGING_USER_ARN}}
   PRE_RUN_SCRIPT_URL: ${{secrets.PRE_RUN_SCRIPT_URL}}
-
+permissions:
+  id-token: write   # This is required for requesting the JWT
 jobs:
   get-previous-version:
     name: Get Previous Major Version
@@ -50,8 +51,8 @@ jobs:
         with:
           sauce-username: ${{ secrets.SAUCE_USERNAME }}
           sauce-access-key: ${{ secrets.SAUCE_ACCESS_KEY }}
-          aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY }}
-          aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
+          aws-role-to-assume: ${{ secrets.AWS_ROLE_TO_ASSUME_SDK_DEV }}
+          aws-role-session-name: ${{ env.TEST_TYPE }}
       - name: Run Audio Compatibility Test
         run: npm run test:browser-compatibility-audio
   browser-compatibility-video-previous-major-version:
@@ -72,8 +73,8 @@ jobs:
         with:
           sauce-username: ${{ secrets.SAUCE_USERNAME }}
           sauce-access-key: ${{ secrets.SAUCE_ACCESS_KEY }}
-          aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY }}
-          aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
+          aws-role-to-assume: ${{ secrets.AWS_ROLE_TO_ASSUME_SDK_DEV }}
+          aws-role-session-name: ${{ env.TEST_TYPE }}
       - name: Run Video Compatibility Test
         run: npm run test:browser-compatibility-video
   browser-compatibility-content-share-previous-major-version:
@@ -95,8 +96,8 @@ jobs:
         with:
           sauce-username: ${{ secrets.SAUCE_USERNAME }}
           sauce-access-key: ${{ secrets.SAUCE_ACCESS_KEY }}
-          aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY }}
-          aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
+          aws-role-to-assume: ${{ secrets.AWS_ROLE_TO_ASSUME_SDK_DEV }}
+          aws-role-session-name: ${{ env.TEST_TYPE }}
       - name: Run Content Share Compatibility Test
         run: npm run test:browser-compatibility-content-share
   browser-compatibility-data-message-previous-major-version:
@@ -118,8 +119,8 @@ jobs:
         with:
           sauce-username: ${{ secrets.SAUCE_USERNAME }}
           sauce-access-key: ${{ secrets.SAUCE_ACCESS_KEY }}
-          aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY }}
-          aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
+          aws-role-to-assume: ${{ secrets.AWS_ROLE_TO_ASSUME_SDK_DEV }}
+          aws-role-session-name: ${{ env.TEST_TYPE }}
       - name: Run Data Message Compatibility Test
         run: npm run test:browser-compatibility-data-message
   browser-compatibility-meeting-readiness-checker-previous-major-version:
@@ -141,8 +142,8 @@ jobs:
         with:
           sauce-username: ${{ secrets.SAUCE_USERNAME }}
           sauce-access-key: ${{ secrets.SAUCE_ACCESS_KEY }}
-          aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY }}
-          aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
+          aws-role-to-assume: ${{ secrets.AWS_ROLE_TO_ASSUME_SDK_DEV }}
+          aws-role-session-name: ${{ env.TEST_TYPE }}
       - name: Run Meeting Readiness Checker Compatibility Test
         run: npm run test:browser-compatibility-meeting-readiness-checker
   browser-compatibility-background-blur-previous-major-version:
@@ -164,8 +165,8 @@ jobs:
         with:
           sauce-username: ${{ secrets.SAUCE_USERNAME }}
           sauce-access-key: ${{ secrets.SAUCE_ACCESS_KEY }}
-          aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY }}
-          aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
+          aws-role-to-assume: ${{ secrets.AWS_ROLE_TO_ASSUME_SDK_DEV }}
+          aws-role-session-name: ${{ env.TEST_TYPE }}
       - name: Run Background Blur Compatibility Test
         run: npm run test:browser-compatibility-background-blur
   browser-compatibility-linux-audio-previous-major-version:
@@ -188,8 +189,8 @@ jobs:
             sauce-username: ${{ secrets.SAUCE_USERNAME }}
             sauce-access-key: ${{ secrets.SAUCE_ACCESS_KEY }}
             sauce-rest-url: https://us-east-1.saucelabs.com/rest/v1
-            aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY }}
-            aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
+            aws-role-to-assume: ${{ secrets.AWS_ROLE_TO_ASSUME_SDK_DEV }}
+            aws-role-session-name: ${{ env.TEST_TYPE }}
         - name: Run Linux Audio Compatibility Test
           run: npm run test:linux-browser-compatibility-audio
   browser-compatibility-linux-video-previous-major-version:
@@ -212,8 +213,8 @@ jobs:
             sauce-username: ${{ secrets.SAUCE_USERNAME }}
             sauce-access-key: ${{ secrets.SAUCE_ACCESS_KEY }}
             sauce-rest-url: https://us-east-1.saucelabs.com/rest/v1
-            aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY }}
-            aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
+            aws-role-to-assume: ${{ secrets.AWS_ROLE_TO_ASSUME_SDK_DEV }}
+            aws-role-session-name: ${{ env.TEST_TYPE }}
         - name: Run Linux Video Compatibility Test
           run: npm run test:linux-browser-compatibility-video
   browser-compatibility-linux-content-share-previous-major-version:
@@ -236,8 +237,8 @@ jobs:
             sauce-username: ${{ secrets.SAUCE_USERNAME }}
             sauce-access-key: ${{ secrets.SAUCE_ACCESS_KEY }}
             sauce-rest-url: https://us-east-1.saucelabs.com/rest/v1
-            aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY }}
-            aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
+            aws-role-to-assume: ${{ secrets.AWS_ROLE_TO_ASSUME_SDK_DEV }}
+            aws-role-session-name: ${{ env.TEST_TYPE }}
         - name: Run Linux Content Share Compatibility Test
           run: npm run test:linux-browser-compatibility-content-share
   browser-compatibility-linux-other-previous-major-version:
@@ -260,8 +261,8 @@ jobs:
             sauce-username: ${{ secrets.SAUCE_USERNAME }}
             sauce-access-key: ${{ secrets.SAUCE_ACCESS_KEY }}
             sauce-rest-url: https://us-east-1.saucelabs.com/rest/v1
-            aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY }}
-            aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
+            aws-role-to-assume: ${{ secrets.AWS_ROLE_TO_ASSUME_SDK_DEV }}
+            aws-role-session-name: ${{ env.TEST_TYPE }}
         - name: Run Linux Other Compatibility Test
           run: npm run test:linux-browser-compatibility-other
   browser-compatibility-results-report-previous-major-version:

diff --git a/.github/workflows/browser-compatibility-test.yml b/.github/workflows/browser-compatibility-test.yml
@@ -1,10 +1,9 @@
 name: Browser Compatibility Test
 
 on:
-  schedule:
-    # More information on cron https://crontab.guru/
-    # GitHub actions is using UTC time. Scheduling action at 5 am PST
-    - cron: '0 13 * * *'
+  pull_request:
+    branches:
+      - main
 
 env:
   SELENIUM_GRID_PROVIDER: saucelabs
@@ -15,7 +14,8 @@ env:
   MESSAGING_USER_ARN: ${{secrets.MESSAGING_USER_ARN}}
   SLACK_JS_SDK_DEV_CORE_WEBHOOK: ${{secrets.SLACK_JS_SDK_DEV_CORE_WEBHOOK}}
   PRE_RUN_SCRIPT_URL: ${{secrets.PRE_RUN_SCRIPT_URL}}
-
+permissions:
+  id-token: write   # This is required for requesting the JWT
 jobs:
   browser-compatibility-audio:
     name: Audio Compatibility Test
@@ -33,8 +33,8 @@ jobs:
         with:
           sauce-username: ${{ secrets.SAUCE_USERNAME }}
           sauce-access-key: ${{ secrets.SAUCE_ACCESS_KEY }}
-          aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY }}
-          aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
+          aws-role-to-assume: ${{ secrets.AWS_ROLE_TO_ASSUME_SDK_DEV }}
+          aws-role-session-name: ${{ env.TEST_TYPE }}
       - name: Run Audio Compatibility Test
         run: npm run test:browser-compatibility-audio
   browser-compatibility-video:
@@ -53,8 +53,8 @@ jobs:
         with:
           sauce-username: ${{ secrets.SAUCE_USERNAME }}
           sauce-access-key: ${{ secrets.SAUCE_ACCESS_KEY }}
-          aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY }}
-          aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
+          aws-role-to-assume: ${{ secrets.AWS_ROLE_TO_ASSUME_SDK_DEV }}
+          aws-role-session-name: ${{ env.TEST_TYPE }}
       - name: Run Video Compatibility Test
         run: npm run test:browser-compatibility-video
   browser-compatibility-content-share:
@@ -75,8 +75,8 @@ jobs:
         with:
           sauce-username: ${{ secrets.SAUCE_USERNAME }}
           sauce-access-key: ${{ secrets.SAUCE_ACCESS_KEY }}
-          aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY }}
-          aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
+          aws-role-to-assume: ${{ secrets.AWS_ROLE_TO_ASSUME_SDK_DEV }}
+          aws-role-session-name: ${{ env.TEST_TYPE }}
       - name: Run Content Share Compatibility Test
         run: npm run test:browser-compatibility-content-share
   browser-compatibility-data-message:
@@ -97,8 +97,8 @@ jobs:
         with:
           sauce-username: ${{ secrets.SAUCE_USERNAME }}
           sauce-access-key: ${{ secrets.SAUCE_ACCESS_KEY }}
-          aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY }}
-          aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
+          aws-role-to-assume: ${{ secrets.AWS_ROLE_TO_ASSUME_SDK_DEV }}
+          aws-role-session-name: ${{ env.TEST_TYPE }}
       - name: Run Data Message Compatibility Test
         run: npm run test:browser-compatibility-data-message
   browser-compatibility-meeting-readiness-checker:
@@ -119,8 +119,8 @@ jobs:
         with:
           sauce-username: ${{ secrets.SAUCE_USERNAME }}
           sauce-access-key: ${{ secrets.SAUCE_ACCESS_KEY }}
-          aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY }}
-          aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
+          aws-role-to-assume: ${{ secrets.AWS_ROLE_TO_ASSUME_SDK_DEV }}
+          aws-role-session-name: ${{ env.TEST_TYPE }}
       - name: Run Meeting Readiness Checker Compatibility Test
         run: npm run test:browser-compatibility-meeting-readiness-checker
   browser-compatibility-background-blur:
@@ -141,8 +141,8 @@ jobs:
         with:
           sauce-username: ${{ secrets.SAUCE_USERNAME }}
           sauce-access-key: ${{ secrets.SAUCE_ACCESS_KEY }}
-          aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY }}
-          aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
+          aws-role-to-assume: ${{ secrets.AWS_ROLE_TO_ASSUME_SDK_DEV }}
+          aws-role-session-name: ${{ env.TEST_TYPE }}
       - name: Run Background Blur Compatibility Test
         run: npm run test:browser-compatibility-background-blur
   browser-compatibility-linux-audio:
@@ -164,8 +164,8 @@ jobs:
             sauce-username: ${{ secrets.SAUCE_USERNAME }}
             sauce-access-key: ${{ secrets.SAUCE_ACCESS_KEY }}
             sauce-rest-url: https://us-east-1.saucelabs.com/rest/v1
-            aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY }}
-            aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
+            aws-role-to-assume: ${{ secrets.AWS_ROLE_TO_ASSUME_SDK_DEV }}
+            aws-role-session-name: ${{ env.TEST_TYPE }}
         - name: Run Linux Audio Compatibility Test
           run: npm run test:linux-browser-compatibility-audio
   browser-compatibility-linux-video:
@@ -187,8 +187,8 @@ jobs:
             sauce-username: ${{ secrets.SAUCE_USERNAME }}
             sauce-access-key: ${{ secrets.SAUCE_ACCESS_KEY }}
             sauce-rest-url: https://us-east-1.saucelabs.com/rest/v1
-            aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY }}
-            aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
+            aws-role-to-assume: ${{ secrets.AWS_ROLE_TO_ASSUME_SDK_DEV }}
+            aws-role-session-name: ${{ env.TEST_TYPE }}
         - name: Run Linux Video Compatibility Test
           run: npm run test:linux-browser-compatibility-video
   browser-compatibility-linux-content-share:
@@ -210,8 +210,8 @@ jobs:
             sauce-username: ${{ secrets.SAUCE_USERNAME }}
             sauce-access-key: ${{ secrets.SAUCE_ACCESS_KEY }}
             sauce-rest-url: https://us-east-1.saucelabs.com/rest/v1
-            aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY }}
-            aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
+            aws-role-to-assume: ${{ secrets.AWS_ROLE_TO_ASSUME_SDK_DEV }}
+            aws-role-session-name: ${{ env.TEST_TYPE }}
         - name: Run Linux Content Share Compatibility Test
           run: npm run test:linux-browser-compatibility-content-share
   browser-compatibility-linux-other:
@@ -233,8 +233,8 @@ jobs:
             sauce-username: ${{ secrets.SAUCE_USERNAME }}
             sauce-access-key: ${{ secrets.SAUCE_ACCESS_KEY }}
             sauce-rest-url: https://us-east-1.saucelabs.com/rest/v1
-            aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY }}
-            aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
+            aws-role-to-assume: ${{ secrets.AWS_ROLE_TO_ASSUME_SDK_DEV }}
+            aws-role-session-name: ${{ env.TEST_TYPE }}
         - name: Run Linux Other Compatibility Test
           run: npm run test:linux-browser-compatibility-other
   browser-compatibility-results-report:

diff --git a/integration/configs/browserCompatibilityTest/desktop/linux/audio_test.config.json b/integration/configs/browserCompatibilityTest/desktop/linux/audio_test.config.json
@@ -10,7 +10,7 @@
       "noOfThreads": 1,
       "testImpl": "AudioTest.js",
       "payload": {
-        "url": "http://localhost:8080/?earlyConnect=1",
+        "url": "http://testsite:8080/?earlyConnect=1",
         "retry": 2
       }
     }

diff --git a/...figs/browserCompatibilityTest/desktop/linux/content_share_screen_capture_test.config.json b/...figs/browserCompatibilityTest/desktop/linux/content_share_screen_capture_test.config.json
@@ -11,7 +11,7 @@
         "noOfThreads": 1,
         "testImpl": "ContentShareScreenCapture.js",
         "payload":{
-          "url": "http://localhost:8080/?earlyConnect=1",
+          "url": "http://testsite:8080/?earlyConnect=1",
           "retry": 2
         }
       }

diff --git a/...ation/configs/browserCompatibilityTest/desktop/linux/content_share_video_test.config.json b/...ation/configs/browserCompatibilityTest/desktop/linux/content_share_video_test.config.json
@@ -10,7 +10,7 @@
       "noOfThreads": 1,
       "testImpl": "ContentShareVideoTest.js",
       "payload": {
-        "url": "http://localhost:8080/",
+        "url": "http://testsite:8080/",
         "retry": 2
       }
     }

diff --git a/integration/configs/browserCompatibilityTest/desktop/linux/data_message_test.config.json b/integration/configs/browserCompatibilityTest/desktop/linux/data_message_test.config.json
@@ -11,7 +11,7 @@
         "noOfThreads": 1,
         "testImpl": "DataMessageTest.js",
         "payload":{
-          "url": "http://localhost:8080/?earlyConnect=1",
+          "url": "http://testsite:8080/?earlyConnect=1",
           "retry": 2
         }
       }

diff --git a/integration/configs/browserCompatibilityTest/desktop/linux/meeting_end_test.config.json b/integration/configs/browserCompatibilityTest/desktop/linux/meeting_end_test.config.json
@@ -11,7 +11,7 @@
         "noOfThreads": 1,
         "testImpl": "MeetingEndTest.js",
         "payload":{
-          "url": "http://localhost:8080/?earlyConnect=1",
+          "url": "http://testsite:8080/?earlyConnect=1",
           "retry": 2
         }
       }

diff --git a/integration/configs/browserCompatibilityTest/desktop/linux/video_test.config.json b/integration/configs/browserCompatibilityTest/desktop/linux/video_test.config.json
@@ -11,7 +11,7 @@
         "noOfThreads": 1,
         "testImpl": "VideoTest.js",
         "payload":{
-          "url": "http://localhost:8080/?earlyConnect=1",
+          "url": "http://testsite:8080/?earlyConnect=1",
           "retry": 2
         }
       }