Merge pull request #1288 from bugsnag/tms/docker-tidy

Use maze runner image and general tidy

.buildkite/react-native-cli-pipeline.yml

@@ -189,6 +189,7 @@ steps:
       artifacts#v1.2.0:
         download: "build/rn0_60.apk"
       docker-compose#v3.7.0:
+        pull: react-native-cli-maze-runner
         run: react-native-cli-maze-runner
         use-aliases: true
         command:
@@ -207,6 +208,7 @@ steps:
       artifacts#v1.2.0:
         download: "build/rn0_61.apk"
       docker-compose#v3.7.0:
+        pull: react-native-cli-maze-runner
         run: react-native-cli-maze-runner
         use-aliases: true
         command:
@@ -225,6 +227,7 @@ steps:
       artifacts#v1.2.0:
         download: "build/rn0_62.apk"
       docker-compose#v3.7.0:
+        pull: react-native-cli-maze-runner
         run: react-native-cli-maze-runner
         use-aliases: true
         command:
@@ -243,6 +246,7 @@ steps:
       artifacts#v1.2.0:
         download: "build/rn0_63.apk"
       docker-compose#v3.7.0:
+        pull: react-native-cli-maze-runner
         run: react-native-cli-maze-runner
         use-aliases: true
         command:
@@ -261,6 +265,7 @@ steps:
       artifacts#v1.2.0:
         download: "build/rn0_60.ipa"
       docker-compose#v3.7.0:
+        pull: react-native-cli-maze-runner
         run: react-native-cli-maze-runner
         use-aliases: true
         command:
@@ -279,6 +284,7 @@ steps:
       artifacts#v1.2.0:
         download: "build/rn0_61.ipa"
       docker-compose#v3.7.0:
+        pull: react-native-cli-maze-runner
         run: react-native-cli-maze-runner
         use-aliases: true
         command:
@@ -297,6 +303,7 @@ steps:
       artifacts#v1.2.0:
         download: "build/rn0_62.ipa"
       docker-compose#v3.7.0:
+        pull: react-native-cli-maze-runner
         run: react-native-cli-maze-runner
         use-aliases: true
         command:
@@ -315,6 +322,7 @@ steps:
       artifacts#v1.2.0:
         download: "build/rn0_63.ipa"
       docker-compose#v3.7.0:
+        pull: react-native-cli-maze-runner
         run: react-native-cli-maze-runner
         use-aliases: true
         command:

.buildkite/react-native-pipeline.yml

@@ -195,6 +195,7 @@ steps:
       artifacts#v1.2.0:
         download: "build/rn0.60.apk"
       docker-compose#v3.3.0:
+        pull: react-native-maze-runner
         run: react-native-maze-runner
         use-aliases: true
         command:
@@ -215,7 +216,8 @@ steps:
     plugins:
       artifacts#v1.2.0:
         download: "build/rn0.60.ipa"
-      docker-compose#v3.1.0:
+      docker-compose#v3.7.0:
+        pull: react-native-maze-runner
         run: react-native-maze-runner
         use-aliases: true
         command:
@@ -238,6 +240,7 @@ steps:
       artifacts#v1.2.0:
         download: "build/rn0.63.apk"
       docker-compose#v3.3.0:
+        pull: react-native-maze-runner
         run: react-native-maze-runner
         use-aliases: true
         command:
@@ -258,7 +261,8 @@ steps:
     plugins:
       artifacts#v1.2.0:
         download: "build/rn0.63.ipa"
-      docker-compose#v3.1.0:
+      docker-compose#v3.7.0:
+        pull: react-native-maze-runner
         run: react-native-maze-runner
         use-aliases: true
         command:
@@ -281,6 +285,7 @@ steps:
       artifacts#v1.2.0:
         download: "build/r_navigation_0.60.apk"
       docker-compose#v3.3.0:
+        pull: react-native-maze-runner
         run: react-native-maze-runner
         use-aliases: true
         command:
@@ -302,7 +307,8 @@ steps:
     plugins:
       artifacts#v1.2.0:
         download: "build/r_navigation_0.60.ipa"
-      docker-compose#v3.1.0:
+      docker-compose#v3.7.0:
+        pull: react-native-maze-runner
         run: react-native-maze-runner
         use-aliases: true
         command:
@@ -324,6 +330,7 @@ steps:
       artifacts#v1.2.0:
         download: "build/r_navigation_0.63.apk"
       docker-compose#v3.3.0:
+        pull: react-native-maze-runner
         run: react-native-maze-runner
         use-aliases: true
         command:
@@ -345,7 +352,8 @@ steps:
     plugins:
       artifacts#v1.2.0:
         download: "build/r_navigation_0.63.ipa"
-      docker-compose#v3.1.0:
+      docker-compose#v3.7.0:
+        pull: react-native-maze-runner
         run: react-native-maze-runner
         use-aliases: true
         command:
@@ -367,6 +375,7 @@ steps:
       artifacts#v1.2.0:
         download: "build/r_native_navigation_0.60.apk"
       docker-compose#v3.3.0:
+        pull: react-native-maze-runner
         run: react-native-maze-runner
         use-aliases: true
         command:
@@ -388,7 +397,8 @@ steps:
     plugins:
       artifacts#v1.2.0:
         download: "build/r_native_navigation_0.60.ipa"
-      docker-compose#v3.1.0:
+      docker-compose#v3.7.0:
+        pull: react-native-maze-runner
         run: react-native-maze-runner
         use-aliases: true
         command:
@@ -410,6 +420,7 @@ steps:
       artifacts#v1.2.0:
         download: "build/r_native_navigation_0.63.apk"
       docker-compose#v3.3.0:
+        pull: react-native-maze-runner
         run: react-native-maze-runner
         use-aliases: true
         command:
@@ -431,7 +442,8 @@ steps:
     plugins:
       artifacts#v1.2.0:
         download: "build/r_native_navigation_0.63.ipa"
-      docker-compose#v3.1.0:
+      docker-compose#v3.7.0:
+        pull: react-native-maze-runner
         run: react-native-maze-runner
         use-aliases: true
         command:

docker-compose.yml

@@ -180,11 +180,7 @@ services:
       - ./test/react-native-cli/features/:/app/features
 
   react-native-maze-runner:
-    build:
-      context: .
-      dockerfile: dockerfiles/Dockerfile.react-native
-      args:
-        - BUILDKITE_BUILD_NUMBER
+    image: 855461928731.dkr.ecr.us-west-1.amazonaws.com/maze-runner-releases:latest-v4-cli
     environment:
       BUILDKITE:
       BUILDKITE_PIPELINE_NAME:
@@ -197,7 +193,8 @@ services:
         aliases:
           - maze-runner
     volumes:
-      - ./build:/app/test/react-native/build
+      - ./build:/app/build
+      - ./test/react-native/features/:/app/features
 
   react-native-cli-maze-runner:
     image: 855461928731.dkr.ecr.us-west-1.amazonaws.com/maze-runner-releases:latest-v4-cli

test/browser/Gemfile

@@ -1,6 +1,6 @@
 source 'https://rubygems.org'
 
-gem 'bugsnag-maze-runner', git: 'https://github.com/bugsnag/maze-runner', tag: 'v4.2.1'
+gem 'bugsnag-maze-runner', git: 'https://github.com/bugsnag/maze-runner', tag: 'v4.8.0'
 
 # Locally, you can run against Maze Runner branches and uncommitted changes:
 #gem 'bugsnag-maze-runner', path: '../../../maze-runner'

test/browser/Gemfile.lock

@@ -1,10 +1,10 @@
 GIT
   remote: https://github.com/bugsnag/maze-runner
-  revision: 17c5cb69fa0f1ac0550eab0a21ebfd6cdb3b4835
-  tag: v4.2.1
+  revision: 7ff68102cc9265e08e81b331a51d95fb220c2581
+  tag: v4.8.0
   specs:
-    bugsnag-maze-runner (4.2.1)
-      appium_lib (~> 10.2)
+    bugsnag-maze-runner (4.8.0)
+      appium_lib (~> 11.2.0)
       boring (~> 0.1.0)
       cucumber (~> 3.1.2)
       cucumber-expressions (~> 6.0.0)
@@ -20,69 +20,17 @@ GIT
 GEM
   remote: https://rubygems.org/
   specs:
-    CFPropertyList (3.0.3)
-    activesupport (5.2.4.4)
-      concurrent-ruby (~> 1.0, >= 1.0.2)
-      i18n (>= 0.7, < 2)
-      minitest (~> 5.1)
-      tzinfo (~> 1.1)
-    addressable (2.7.0)
-      public_suffix (>= 2.0.2, < 5.0)
-    algoliasearch (1.27.5)
-      httpclient (~> 2.8, >= 2.8.3)
-      json (>= 1.5.1)
-    appium_lib (10.6.0)
-      appium_lib_core (~> 3.3)
+    appium_lib (11.2.0)
+      appium_lib_core (~> 4.1)
       nokogiri (~> 1.8, >= 1.8.1)
       tomlrb (~> 1.1)
-    appium_lib_core (3.11.1)
+    appium_lib_core (4.3.1)
       faye-websocket (~> 0.11.0)
       selenium-webdriver (~> 3.14, >= 3.14.1)
-    atomos (0.1.3)
-    backports (3.20.1)
+    backports (3.20.2)
     boring (0.1.0)
     builder (3.2.4)
     childprocess (3.0.0)
-    claide (1.0.3)
-    cocoapods (1.10.1)
-      addressable (~> 2.6)
-      claide (>= 1.0.2, < 2.0)
-      cocoapods-core (= 1.10.1)
-      cocoapods-deintegrate (>= 1.0.3, < 2.0)
-      cocoapods-downloader (>= 1.4.0, < 2.0)
-      cocoapods-plugins (>= 1.0.0, < 2.0)
-      cocoapods-search (>= 1.0.0, < 2.0)
-      cocoapods-trunk (>= 1.4.0, < 2.0)
-      cocoapods-try (>= 1.1.0, < 2.0)
-      colored2 (~> 3.1)
-      escape (~> 0.0.4)
-      fourflusher (>= 2.3.0, < 3.0)
-      gh_inspector (~> 1.0)
-      molinillo (~> 0.6.6)
-      nap (~> 1.0)
-      ruby-macho (~> 1.4)
-      xcodeproj (>= 1.19.0, < 2.0)
-    cocoapods-core (1.10.1)
-      activesupport (> 5.0, < 6)
-      addressable (~> 2.6)
-      algoliasearch (~> 1.0)
-      concurrent-ruby (~> 1.1)
-      fuzzy_match (~> 2.0.4)
-      nap (~> 1.0)
-      netrc (~> 0.11)
-      public_suffix
-      typhoeus (~> 1.0)
-    cocoapods-deintegrate (1.0.4)
-    cocoapods-downloader (1.4.0)
-    cocoapods-plugins (1.0.0)
-      nap
-    cocoapods-search (1.0.0)
-    cocoapods-trunk (1.5.0)
-      nap (>= 0.8, < 2.0)
-      netrc (~> 0.11)
-    cocoapods-try (1.2.0)
-    colored2 (3.1.2)
-    concurrent-ruby (1.1.8)
     cucumber (3.1.2)
       builder (>= 2.1.2)
       cucumber-core (~> 3.2.0)
@@ -101,68 +49,39 @@ GEM
     cucumber-wire (0.0.1)
     curb (0.9.11)
     diff-lcs (1.4.4)
-    escape (0.0.4)
-    ethon (0.12.0)
-      ffi (>= 1.3.0)
     eventmachine (1.2.7)
     faye-websocket (0.11.0)
       eventmachine (>= 0.12.0)
       websocket-driver (>= 0.5.1)
-    ffi (1.14.2)
-    fourflusher (2.3.1)
-    fuzzy_match (2.0.4)
-    gh_inspector (1.1.3)
     gherkin (5.1.0)
-    httpclient (2.8.3)
-    i18n (1.8.7)
-      concurrent-ruby (~> 1.0)
-    json (2.5.1)
     mini_portile2 (2.5.0)
     minitest (5.14.3)
-    molinillo (0.6.6)
     multi_json (1.15.0)
     multi_test (0.1.2)
-    nanaimo (0.3.0)
-    nap (1.1.0)
-    netrc (0.11.0)
     nokogiri (1.11.1)
       mini_portile2 (~> 2.5.0)
       racc (~> 1.4)
     optimist (3.0.1)
     os (1.0.1)
     power_assert (2.0.0)
-    public_suffix (4.0.6)
     racc (1.5.2)
     rake (12.3.3)
-    ruby-macho (1.4.0)
     rubyzip (2.3.0)
     selenium-webdriver (3.142.7)
       childprocess (>= 0.5, < 4.0)
       rubyzip (>= 1.2.2)
     test-unit (3.3.9)
       power_assert
-    thread_safe (0.3.6)
     tomlrb (1.3.0)
-    typhoeus (1.4.0)
-      ethon (>= 0.9.0)
-    tzinfo (1.2.9)
-      thread_safe (~> 0.1)
     websocket-driver (0.7.3)
       websocket-extensions (>= 0.1.0)
     websocket-extensions (0.1.5)
-    xcodeproj (1.19.0)
-      CFPropertyList (>= 2.3.3, < 4.0)
-      atomos (~> 0.1.3)
-      claide (>= 1.0.2, < 2.0)
-      colored2 (~> 3.1)
-      nanaimo (~> 0.3.0)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
   bugsnag-maze-runner!
-  cocoapods
 
 BUNDLED WITH
    2.1.4

test/react-native-cli/Gemfile

@@ -4,7 +4,7 @@ gem 'cocoapods'
 
 # 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: 'v4.6.0'
+gem 'bugsnag-maze-runner', git: 'https://github.com/bugsnag/maze-runner', tag: 'v4.8.0'
 
 # Locally, you can run against Maze Runner branches and uncommitted changes:
 #gem 'bugsnag-maze-runner', path: '../maze-runner'