Merge pull request #934 from bugsnag/tms/use-maze-variables

Use MazeRunner environment variables where available
bugsnag · Dec 10, 2020 · 0bfaf82 · 0bfaf82
2 parents d69bf71 + 3130d89
commit 0bfaf82
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 22 deletions.
diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml
@@ -25,8 +25,6 @@ steps:
           - "--app=/app/build/iOSTestApp.ipa"
           - "--farm=bs"
           - "--device=IOS_14"
-          - "--username=$BROWSER_STACK_USERNAME"
-          - "--access-key=$BROWSER_STACK_ACCESS_KEY"
           - "--resilient"
           - "--appium-version=1.17.0"
           - "--fail-fast"
@@ -50,8 +48,6 @@ steps:
           - "--app=/app/build/iOSTestApp.ipa"
           - "--farm=bs"
           - "--device=IOS_13"
-          - "--username=$BROWSER_STACK_USERNAME"
-          - "--access-key=$BROWSER_STACK_ACCESS_KEY"
           - "--resilient"
           - "--appium-version=1.17.0"
           - "--fail-fast"
@@ -75,8 +71,6 @@ steps:
           - "--app=/app/build/iOSTestApp.ipa"
           - "--farm=bs"
           - "--device=IOS_12"
-          - "--username=$BROWSER_STACK_USERNAME"
-          - "--access-key=$BROWSER_STACK_ACCESS_KEY"
           - "--resilient"
           - "--appium-version=1.17.0"
           - "--fail-fast"
@@ -88,7 +82,9 @@ steps:
           limit: 2
 
   - label: ':ios: iOS 11 end-to-end tests'
-    timeout_in_minutes: 60
+    # More time than other steps as the BrowserStack iOS 11 devices seem particularly unstable and
+    # sessions need resetting frequently, taking a minute or more each time.
+    timeout_in_minutes: 90
     agents:
       queue: opensource
     plugins:
@@ -100,8 +96,6 @@ steps:
           - "--app=/app/build/iOSTestApp.ipa"
           - "--farm=bs"
           - "--device=IOS_11_0_IPHONE_8_PLUS"
-          - "--username=$BROWSER_STACK_USERNAME"
-          - "--access-key=$BROWSER_STACK_ACCESS_KEY"
           - "--resilient"
           - "--appium-version=1.16.0"
           - "--fail-fast"
@@ -125,8 +119,6 @@ steps:
           - "--app=/app/build/iOSTestApp.ipa"
           - "--farm=bs"
           - "--device=IOS_10"
-          - "--username=$BROWSER_STACK_USERNAME"
-          - "--access-key=$BROWSER_STACK_ACCESS_KEY"
           - "--resilient"
           - "--appium-version=1.15.0"
           - "--fail-fast"

diff --git a/Gemfile b/Gemfile
@@ -5,7 +5,7 @@ gem 'xcpretty'
 
 # A reference to Maze Runner is only needed for running tests locally and if committed it must be
 # portable for CI, e.g. a specific release.  However, leaving it commented out would mean quicker CI.
-gem 'bugsnag-maze-runner', git: 'https://github.com/bugsnag/maze-runner', tag: 'v3.3.0'
+gem 'bugsnag-maze-runner', git: 'https://github.com/bugsnag/maze-runner', tag: 'v3.6.0'
 
 # Locally, you can run against Maze Runner branches and uncommitted changes:
 # gem 'bugsnag-maze-runner', path: '../maze-runner'

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -1,9 +1,9 @@
 GIT
   remote: https://github.com/bugsnag/maze-runner
-  revision: 627c13ab684e9b021b94ab9678cab09c48a78a59
-  tag: v3.3.0
+  revision: b73093f128efdea444966969cd3526e26de8ed5b
+  tag: v3.6.0
   specs:
-    bugsnag-maze-runner (3.3.0)
+    bugsnag-maze-runner (3.6.0)
       appium_lib (~> 10.2)
       cucumber (~> 3.1.2)
       cucumber-expressions (~> 6.0.0)
@@ -34,7 +34,7 @@ GEM
       appium_lib_core (~> 3.3)
       nokogiri (~> 1.8, >= 1.8.1)
       tomlrb (~> 1.1)
-    appium_lib_core (3.11.0)
+    appium_lib_core (3.11.1)
       faye-websocket (~> 0.11.0)
       selenium-webdriver (~> 3.14, >= 3.14.1)
     atomos (0.1.3)
@@ -136,7 +136,7 @@ GEM
     selenium-webdriver (3.142.7)
       childprocess (>= 0.5, < 4.0)
       rubyzip (>= 1.2.2)
-    test-unit (3.3.6)
+    test-unit (3.3.7)
       power_assert
     thread_safe (0.3.6)
     tomlrb (1.3.0)

diff --git a/TESTING.md b/TESTING.md
@@ -56,8 +56,9 @@ __Your session will periodically expire__, so you'll need to run this command to
 #### Steps
 
 1. Ensure the following environment variables are set:
-    - `BROWSER_STACK_USERNAME` - your BrowserStack App Automate Username
-    - `BROWSER_STACK_ACCESS_KEY` - your BrowserStack App Automate Access Key
+    - `MAZE_DEVICE_FARM_USERNAME` - your BrowserStack App Automate Username
+    - `MAZE_DEVICE_FARM_ACCESS_KEY` - your BrowserStack App Automate Access Key
+    - `MAZE_BS_LOCAL` - location of the `BrowserStackLocal` executable on your local file system
 1. Build the test fixtures:
     ```shell script
     make test-fixtures
@@ -69,9 +70,6 @@ __Your session will periodically expire__, so you'll need to run this command to
     bundle exec maze-runner --app=features/fixtures/ios-swift-cocoapods/output/iOSTestApp.ipa \
                             --farm=bs                                                         \
                             --device=IOS_14                                                   \
-                            --username=$BROWSER_STACK_USERNAME                                \
-                            --access-key=$BROWSER_STACK_ACCESS_KEY                            \
-                            --bs-local=~/BrowserStackLocal                                    \
                             features/app_and_device_attributes.feature
     ```
 1. To run all features, omit the final argument.

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -5,6 +5,10 @@ services:
     environment:
       DEBUG:
       VERBOSE:
+      BUILDKITE:
+      BUILDKITE_PIPELINE_NAME:
+      MAZE_DEVICE_FARM_USERNAME:
+      MAZE_DEVICE_FARM_ACCESS_KEY:
     volumes:
       - ./features/fixtures/ios-swift-cocoapods/output:/app/build
       - ./features/:/app/features/