Rework to only build one fixture app

[full ci]
bugsnag · Jun 21, 2021 · 55c47b3 · 55c47b3
1 parent 6a451dd
commit 55c47b3
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 69 deletions.
diff --git a/.buildkite/pipeline.full.yml b/.buildkite/pipeline.full.yml
@@ -179,32 +179,7 @@ steps:
       queue: opensource-mac-cocoa-11
     plugins:
       artifacts#v1.3.0:
-        download:
-          from: macOSTestApp_intel.zip
-          to: features/fixtures/macos/output/macOSTestApp.zip
-        upload: ["macOSTestApp.log", "appium_server.log"]
-    commands:
-      - bundle install
-      - bundle exec maze-runner
-        --farm=local
-        --os=macos
-        --os-version=11.0
-        --app=macOSTestApp
-        --tags='not @skip_macos'
-        --fail-fast
-        --order=random
-
-  - label: 'Intel macOS 11.0 E2E tests'
-    depends_on:
-      - cocoa_fixture
-    timeout_in_minutes: 60
-    agents:
-      queue: opensource-mac-cocoa-11
-    plugins:
-      artifacts#v1.3.0:
-        download:
-          from: macOSTestApp_intel.zip
-          to: features/fixtures/macos/output/macOSTestApp.zip
+        download: ["features/fixtures/macos/output/macOSTestApp.zip"]
         upload: ["macOSTestApp.log", "appium_server.log"]
     commands:
       - bundle install
@@ -217,18 +192,17 @@ steps:
         --fail-fast
         --order=random
 
+  # TODO: Skip penmding PLAT-6822
   - label: 'ARM macOS 11.0 E2E tests'
     skip: Pending PLAT-6822
     depends_on:
-      - m1_fixture
+      - cocoa_fixture
     timeout_in_minutes: 10
     agents:
       queue: opensource-m1-mac-cocoa-11
     plugins:
       artifacts#v1.3.0:
-        download:
-          from: macOSTestApp_arm.zip
-          to: features/fixtures/macos/output/macOSTestApp.zip
+        download: ["features/fixtures/macos/output/macOSTestApp.zip"]
         upload: ["macOSTestApp.log", "appium_server.log"]
     commands:
       - bundle config set --local path 'vendor/bundle'
@@ -250,9 +224,7 @@ steps:
       queue: opensource-mac-cocoa-10.13
     plugins:
       artifacts#v1.3.0:
-        download:
-          from: macOSTestApp_intel.zip
-          to: features/fixtures/macos/output/macOSTestApp.zip
+        download: ["features/fixtures/macos/output/macOSTestApp.zip"]
         upload: ["macOSTestApp.log", "appium_server.log"]
     commands:
       - bundle install
@@ -273,9 +245,7 @@ steps:
       queue: opensource-mac-cocoa-10.14
     plugins:
       artifacts#v1.3.0:
-        download:
-          from: macOSTestApp_intel.zip
-          to: features/fixtures/macos/output/macOSTestApp.zip
+        download: ["features/fixtures/macos/output/macOSTestApp.zip"]
         upload: ["macOSTestApp.log", "appium_server.log"]
     commands:
       - bundle install

diff --git a/.buildkite/pipeline.quick.yml b/.buildkite/pipeline.quick.yml
@@ -122,9 +122,7 @@ steps:
       queue: opensource-mac-cocoa-10.15
     plugins:
       artifacts#v1.3.0:
-        download:
-          from: macOSTestApp_intel.zip
-          to: features/fixtures/macos/output/macOSTestApp.zip
+        download: ["features/fixtures/macos/output/macOSTestApp.zip"]
         upload: ["macOSTestApp.log", "appium_server.log"]
     commands:
       - bundle install

diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml
@@ -22,31 +22,13 @@ steps:
     timeout_in_minutes: 20
     agents:
       queue: opensource-mac-cocoa-11
-    plugins:
-      - artifacts#v1.3.0:
-          upload:
-            from: features/fixtures/ios/output/iOSTestApp.ipa
-            to: features/fixtures/ios/output/iOSTestApp.ipa
-      - artifacts#v1.3.0:
-          upload:
-            from: features/fixtures/macos/output/macOSTestApp.zip
-            to: macOSTestApp_intel.zip
+    artifact_paths:
+      - features/fixtures/ios/output/iOSTestApp.ipa
+      - features/fixtures/macos/output/macOSTestApp.zip
     commands:
       - ./features/scripts/export_ios_app.sh
       - ./features/scripts/export_mac_app.sh
 
-  - label: Build M1 test fixture
-    key: m1_fixture
-    timeout_in_minutes: 20
-    agents:
-      queue: opensource-m1-mac-cocoa-11
-    plugins:
-      - artifacts#v1.3.0:
-          upload:
-            from: features/fixtures/macos/output/macOSTestApp.zip
-            to: macOSTestApp_arm.zip
-    command: /bin/bash -c './features/scripts/export_mac_app.sh macOSTestApp'
-
   - label: Static framework and Swift Package Manager builds
     timeout_in_minutes: 10
     agents:
@@ -75,7 +57,7 @@ steps:
   # Unit tests
   #
 
-  - label: macOS 11 M1 unit tests
+  - label: ARM macOS 11 unit tests
     timeout_in_minutes: 10
     agents:
       queue: opensource-m1-mac-cocoa-11
@@ -198,17 +180,15 @@ steps:
         - exit_status: -1  # Agent was lost
           limit: 2
 
-  - label: 'Intel macOS 10.15 barebones E2E tests'
+  - label: 'macOS 10.15 barebones E2E tests'
     depends_on:
       - cocoa_fixture
     timeout_in_minutes: 10
     agents:
       queue: opensource-mac-cocoa-10.15
     plugins:
       artifacts#v1.3.0:
-        download:
-          from: macOSTestApp_intel.zip
-          to: features/fixtures/macos/output/macOSTestApp.zip
+        download: ["features/fixtures/macos/output/macOSTestApp.zip"]
         upload: ["macOSTestApp.log", "appium_server.log"]
     commands:
       - bundle install
@@ -222,18 +202,17 @@ steps:
         --fail-fast
         --order=random
 
+  # TODO: Skip penmding PLAT-6822
   - label: 'ARM macOS 11 barebones E2E tests'
     skip: Pending PLAT-6822
     depends_on:
-      - m1_fixture
+      - cocoa_fixture
     timeout_in_minutes: 10
     agents:
       queue: opensource-m1-mac-cocoa-11
     plugins:
       artifacts#v1.3.0:
-        download:
-          from: macOSTestApp_arm.zip
-          to: features/fixtures/macos/output/macOSTestApp.zip
+        download: ["features/fixtures/macos/output/macOSTestApp.zip"]
         upload: ["macOSTestApp.log", "appium_server.log"]
     commands:
       - bundle config set --local path 'vendor/bundle'