Buildkite pipeline tidy-up

.buildkite/basic/browser-pipeline.yml

@@ -1,3 +1,6 @@
+agents:
+  queue: "opensource"
+
 steps:
 
   - group: "Browser Tests"
@@ -196,4 +199,4 @@ steps:
             api-token-env-name: "BROWSER_BUILDKITE_ANALYTICS_TOKEN"
         concurrency: 2
         concurrency_group: "browserstack"
-        concurrency_method: eager
+        concurrency_method: eager

.buildkite/basic/node-pipeline.yml

@@ -1,3 +1,6 @@
+agents:
+  queue: "opensource"
+
 steps:
 
   - group: "Node Tests"

.buildkite/basic/react-native-android-pipeline.yml

@@ -1,10 +1,13 @@
+agents:
+  queue: "opensource"
+
 steps:
 
   - group: "React Native (Android) Tests"
     steps:
       - label: ':android: Build RN {{matrix}} test fixture APK (Old Arch)'
         key: "build-react-native-android-fixture-old-arch"
-        timeout_in_minutes: 30
+        timeout_in_minutes: 15
         agents:
           queue: macos-14
         env:
@@ -28,7 +31,7 @@ steps:
 
       - label: ':android: Build RN {{matrix}} test fixture APK (New Arch)'
         key: "build-react-native-android-fixture-new-arch"
-        timeout_in_minutes: 30
+        timeout_in_minutes: 15
         agents:
           queue: macos-14
         env:
@@ -55,7 +58,7 @@ steps:
       #
       - label: ":bitbar: :android: RN {{matrix}} Android 12 (Old Arch) end-to-end tests"
         depends_on: "build-react-native-android-fixture-old-arch"
-        timeout_in_minutes: 60
+        timeout_in_minutes: 30
         plugins:
           artifacts#v1.9.0:
             download: "test/react-native/features/fixtures/generated/old-arch/{{matrix}}/reactnative.apk"
@@ -92,7 +95,7 @@ steps:
 
       - label: ":bitbar: :android: RN {{matrix}} Android 12 (New Arch) end-to-end tests"
         depends_on: "build-react-native-android-fixture-new-arch"
-        timeout_in_minutes: 60
+        timeout_in_minutes: 30
         plugins:
           artifacts#v1.9.0:
             download: "test/react-native/features/fixtures/generated/new-arch/{{matrix}}/reactnative.apk"

.buildkite/basic/react-native-ios-pipeline.yml

@@ -1,3 +1,6 @@
+agents:
+  queue: "opensource"
+
 steps:
 
   - group: "React Native (iOS) Tests"
@@ -8,7 +11,7 @@ steps:
       #
       - label: ':mac: Build RN {{matrix}} test fixture ipa (Old Arch)'
         key: "build-react-native-ios-fixture-old-arch"
-        timeout_in_minutes: 30
+        timeout_in_minutes: 20
         agents:
           queue: "macos-14"
         env:
@@ -32,7 +35,7 @@ steps:
 
       - label: ':mac: Build RN {{matrix}} test fixture ipa (New Arch)'
         key: "build-react-native-ios-fixture-new-arch"
-        timeout_in_minutes: 30
+        timeout_in_minutes: 20
         agents:
           queue: "macos-14"
         env:
@@ -56,9 +59,9 @@ steps:
       #
       # End-to-end tests
       #
-      - label: ":bitbar: :mac: RN {{matrix}} iOS 16 (Old Arch) end-to-end tests"
+      - label: ":bitbar: :mac: RN {{matrix}} iOS (Old Arch) end-to-end tests"
         depends_on: "build-react-native-ios-fixture-old-arch"
-        timeout_in_minutes: 60
+        timeout_in_minutes: 30
         plugins:
           artifacts#v1.9.0:
             download: "test/react-native/features/fixtures/generated/old-arch/{{matrix}}/output/reactnative.ipa"
@@ -70,7 +73,7 @@ steps:
             command:
               - --app=/app/features/fixtures/generated/old-arch/{{matrix}}/output/reactnative.ipa
               - --farm=bb
-              - --device=IOS_16
+              - --device=IOS_15
               - --fail-fast
               - --no-tunnel
               - --aws-public-ip
@@ -92,9 +95,9 @@ steps:
           - "0.75"
           - "0.76"
 
-      - label: ":bitbar: :mac: RN {{matrix}} iOS 16 (New Arch) end-to-end tests"
+      - label: ":bitbar: :mac: RN {{matrix}} iOS (New Arch) end-to-end tests"
         depends_on: "build-react-native-ios-fixture-new-arch"
-        timeout_in_minutes: 60
+        timeout_in_minutes: 30
         plugins:
           artifacts#v1.9.0:
             download: "test/react-native/features/fixtures/generated/new-arch/{{matrix}}/output/reactnative.ipa"
@@ -106,7 +109,7 @@ steps:
             command:
               - --app=/app/features/fixtures/generated/new-arch/{{matrix}}/output/reactnative.ipa
               - --farm=bb
-              - --device=IOS_16
+              - --device=IOS_15
               - --fail-fast
               - --no-tunnel
               - --aws-public-ip

.buildkite/full/block.yml

@@ -4,4 +4,7 @@ steps:
 
   - label: 'Upload the full test pipeline'
     depends_on: 'trigger-full-build'
+    agents:
+      queue: macos
+    timeout_in_minutes: 5
     command: buildkite-agent pipeline upload .buildkite/full/pipeline.full.yml

.buildkite/full/pipeline.full.yml

@@ -1,3 +1,6 @@
+agents:
+  queue: "opensource"
+
 steps:
 
   #
@@ -25,19 +28,28 @@ steps:
     depends_on:
     - "publish-js"
     - "android-builder-base-java-11"
+    agents:
+      queue: "macos"
+    timeout_in_minutes: 5
     commands:
       - buildkite-agent pipeline upload .buildkite/full/react-native-android-pipeline.full.yml
 
   - label: ":large_blue_circle: :large_blue_circle: :large_blue_circle: FULL REACT NATIVE (IOS) STEPS :large_blue_circle: :large_blue_circle: :large_blue_circle:"
     depends_on:
     - "publish-js"
+    agents:
+      queue: "macos"
+    timeout_in_minutes: 5
     commands:
       - buildkite-agent pipeline upload .buildkite/full/react-native-ios-pipeline.full.yml
 
   - label: ":large_blue_circle: :large_blue_circle: :large_blue_circle: REACT NATIVE CLI STEPS :large_blue_circle: :large_blue_circle: :large_blue_circle:"
     depends_on:
       - "publish-js"
       - "android-builder-base-java-11"
+    agents:
+      queue: "macos"
+    timeout_in_minutes: 5
     commands:
       - buildkite-agent pipeline upload .buildkite/full/react-native-cli-pipeline.full.yml
 

.buildkite/full/react-native-android-pipeline.full.yml

@@ -1,3 +1,6 @@
+agents:
+  queue: opensource
+
 steps:
 
   - group: "React Native (Android) Tests"
@@ -7,7 +10,7 @@ steps:
       #
       - label: ":docker: Build RN Android Builder image (Java 11, Node 16)"
         key: "android-builder-image-java-11-node-16"
-        timeout_in_minutes: 30
+        timeout_in_minutes: 20
         plugins:
           - docker-compose#v4.12.0:
               build: react-native-android-builder-java-11-node-16
@@ -27,7 +30,7 @@ steps:
         key: "rn-0-66-apk"
         depends_on:
           - "android-builder-image-java-11-node-16"
-        timeout_in_minutes: 60
+        timeout_in_minutes: 20
         env:
           REACT_NATIVE_VERSION: "rn0.66"
         plugins:
@@ -45,7 +48,7 @@ steps:
         key: "rn-0-67-apk"
         depends_on:
           - "android-builder-image-java-11-node-16"
-        timeout_in_minutes: 60
+        timeout_in_minutes: 20
         env:
           REACT_NATIVE_VERSION: "rn0.67"
         plugins:
@@ -63,7 +66,7 @@ steps:
         key: "rn-0-68-hermes-apk"
         depends_on:
           - "android-builder-image-java-11-node-16"
-        timeout_in_minutes: 60
+        timeout_in_minutes: 20
         env:
           REACT_NATIVE_VERSION: "rn0.68-hermes"
         plugins:
@@ -81,7 +84,7 @@ steps:
         key: "rn-0-69-apk"
         depends_on:
           - "android-builder-image-java-11-node-16"
-        timeout_in_minutes: 60
+        timeout_in_minutes: 20
         env:
           REACT_NATIVE_VERSION: "rn0.69"
         plugins:
@@ -97,7 +100,7 @@ steps:
 
       - label: ':android: Build RN {{matrix}} test fixture APK (Old Arch)'
         key: "build-react-native-android-fixture-old-arch-full"
-        timeout_in_minutes: 30
+        timeout_in_minutes: 15
         agents:
           queue: macos-14
         env:
@@ -123,7 +126,7 @@ steps:
 
       - label: ':android: Build RN {{matrix}} test fixture APK (New Arch)'
         key: "build-react-native-android-fixture-new-arch-full"
-        timeout_in_minutes: 30
+        timeout_in_minutes: 15
         agents:
           queue: macos-14
         env:
@@ -202,7 +205,7 @@ steps:
       #
       - label: ":bitbar: :android: RN 0.66 Android end-to-end tests"
         depends_on: "rn-0-66-apk"
-        timeout_in_minutes: 60
+        timeout_in_minutes: 30
         plugins:
           artifacts#v1.9.0:
             download: "build/rn0.66.apk"
@@ -234,7 +237,7 @@ steps:
 
       - label: ":bitbar: :android: RN 0.67 Android end-to-end tests"
         depends_on: "rn-0-67-apk"
-        timeout_in_minutes: 60
+        timeout_in_minutes: 30
         plugins:
           artifacts#v1.9.0:
             download: "build/rn0.67.apk"
@@ -267,7 +270,7 @@ steps:
 
       - label: ":bitbar: :android: RN 0.69 Android end-to-end tests"
         depends_on: "rn-0-69-apk"
-        timeout_in_minutes: 60
+        timeout_in_minutes: 30
         plugins:
           artifacts#v1.9.0:
             download: "build/rn0.69.apk"
@@ -300,7 +303,7 @@ steps:
 
       - label: ":bitbar: :android: RN 0.68 (Hermes) Android end-to-end tests"
         depends_on: "rn-0-68-hermes-apk"
-        timeout_in_minutes: 60
+        timeout_in_minutes: 30
         plugins:
           artifacts#v1.9.0:
             download: "build/rn0.68-hermes.apk"
@@ -333,7 +336,7 @@ steps:
 
       - label: ":bitbar: :android: RN {{matrix}} Android 12 (Old Arch) end-to-end tests"
         depends_on: "build-react-native-android-fixture-old-arch-full"
-        timeout_in_minutes: 60
+        timeout_in_minutes: 30
         plugins:
           artifacts#v1.9.0:
             download: "test/react-native/features/fixtures/generated/old-arch/{{matrix}}/reactnative.apk"
@@ -375,7 +378,7 @@ steps:
       # TODO: Investigate and try to re-enable when we add tests for more recent React Native versions
       - label: ":bitbar: :android: RN {{matrix}} Android 12 (New Arch) end-to-end tests"
         depends_on: "build-react-native-android-fixture-new-arch-full"
-        timeout_in_minutes: 60
+        timeout_in_minutes: 30
         plugins:
           artifacts#v1.9.0:
             download: "test/react-native/features/fixtures/generated/new-arch/{{matrix}}/reactnative.apk"
@@ -414,7 +417,7 @@ steps:
 
       - label: ":bitbar: :android: react-native-navigation {{matrix}} Android 12 (Old Arch) end-to-end tests"
         depends_on: "build-react-native-navigation-android-fixture-old-arch"
-        timeout_in_minutes: 60
+        timeout_in_minutes: 10
         plugins:
           artifacts#v1.9.0:
             download: "test/react-native/features/fixtures/generated/react-native-navigation/old-arch/{{matrix}}/reactnative.apk"
@@ -453,7 +456,7 @@ steps:
 
       - label: ":bitbar: :android: react-native-navigation {{matrix}} Android 12 (New Arch) end-to-end tests"
         depends_on: "build-react-native-navigation-android-fixture-new-arch"
-        timeout_in_minutes: 60
+        timeout_in_minutes: 10
         plugins:
           artifacts#v1.9.0:
             download: "test/react-native/features/fixtures/generated/react-native-navigation/new-arch/{{matrix}}/reactnative.apk"

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

@@ -1,3 +1,6 @@
+agents:
+  queue: "opensource"
+
 steps:
 
   - group: "React Native CLI Tests"
@@ -87,7 +90,7 @@ steps:
       #
       - label: ":ios: Init and build RN CLI 0.66 ipa"
         key: "rn-cli-0-66-ipa"
-        timeout_in_minutes: 30
+        timeout_in_minutes: 15
         agents:
           queue: "macos-12-arm"
         env:
@@ -104,7 +107,7 @@ steps:
 
       - label: ":ios: Init and build RN CLI 0.67 ipa (Non-hermes)"
         key: "rn-cli-0-67-ipa"
-        timeout_in_minutes: 30
+        timeout_in_minutes: 15
         agents:
           queue: "macos-12-arm"
         env:
@@ -121,7 +124,7 @@ steps:
 
       - label: ":ios: Init and build RN CLI 0.69 ipa (Non-hermes)"
         key: "rn-cli-0-69-ipa"
-        timeout_in_minutes: 30
+        timeout_in_minutes: 15
         agents:
           queue: "macos-12-arm"
         env: