Merge pull request #2261 from bugsnag/gingerbenw/rebase-integration-ts

Rebase from next
bugsnag · Nov 25, 2024 · 4605afc · 4605afc
2 parents 15622fb + f66cf12
commit 4605afc
Show file tree

Hide file tree

Showing 78 changed files with 394 additions and 828 deletions.
diff --git a/.buildkite/basic/browser-pipeline.yml b/.buildkite/basic/browser-pipeline.yml
@@ -59,6 +59,7 @@ steps:
             service-ports: true
             use-aliases: true
             command:
+              - "--https"
               - "--farm=bb"
               - "--browser={{matrix}}"
               - "--no-tunnel"
@@ -135,15 +136,10 @@ steps:
         env:
           HOST: "localhost" # IE11 needs the host set to localhost for some reason
 
-      #
-      # BrowserStack tests
-      #
       - label: ":browserstack: {{matrix}} tests"
         matrix:
           - edge_17
           - safari_10
-          - safari_16
-          - ios_10
           - ios_15
           - android_7
           # TODO: Move these to BitBar
@@ -158,6 +154,7 @@ steps:
             run: browser-maze-runner-bs
             use-aliases: true
             command:
+              - "--https"
               - "--farm=bs"
               - "--browser={{matrix}}"
           artifacts#v1.5.0:
@@ -171,3 +168,32 @@ steps:
         concurrency: 2
         concurrency_group: "browserstack"
         concurrency_method: eager
+
+      #
+      # BrowserStack non-https tests
+      #
+      - label: ":browserstack: {{matrix}} non-https tests"
+        matrix:
+          - safari_16
+          - ios_10
+        depends_on: "browser-maze-runner-bs"
+        timeout_in_minutes: 30
+        plugins:
+          docker-compose#v4.12.0:
+            pull: browser-maze-runner-bs
+            run: browser-maze-runner-bs
+            use-aliases: true
+            command:
+              - "--farm=bs"
+              - "--browser={{matrix}}"
+          artifacts#v1.5.0:
+            upload:
+              - "./test/browser/maze_output/failed/**/*"
+          test-collector#v1.10.2:
+            files: "reports/TEST-*.xml"
+            format: "junit"
+            branch: "^main|next$$"
+            api-token-env-name: "BROWSER_BUILDKITE_ANALYTICS_TOKEN"
+        concurrency: 2
+        concurrency_group: "browserstack"
+        concurrency_method: eager