Skip to content

Commit

Permalink
Buildkite pipeline tidy-up
Browse files Browse the repository at this point in the history
[full ci]
  • Loading branch information
Steve Kirkland committed Dec 2, 2024
1 parent 51c4401 commit 3d29865
Show file tree
Hide file tree
Showing 9 changed files with 66 additions and 32 deletions.
3 changes: 3 additions & 0 deletions .buildkite/block.full.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,7 @@ steps:

- label: 'Upload the full test pipeline'
depends_on: 'trigger-full-build'
agents:
queue: macos
timeout_in_minutes: 2
command: buildkite-agent pipeline upload .buildkite/pipeline.full.yml
6 changes: 6 additions & 0 deletions .buildkite/browser-pipeline.full.yml
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
agents:
queue: "opensource"

steps:
- label: ":docker: Build BrowserStack Maze Runner image"
key: "browser-maze-runner-bs"
Expand Down Expand Up @@ -43,5 +46,8 @@ steps:
concurrency_group: "browserstack"

- label: ":pipeline_upload: Basic browser pipeline with CDN build"
agents:
queue: "macos"
timeout_in_minutes: 2
commands:
- USE_CDN_BUILD=1 EXTRA_STEP_LABEL=" (CDN)" buildkite-agent pipeline upload .buildkite/browser-pipeline.yml
5 changes: 4 additions & 1 deletion .buildkite/browser-pipeline.yml
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
agents:
queue: "opensource"

steps:
- group: "Browser Tests"
steps:
Expand Down Expand Up @@ -126,4 +129,4 @@ steps:
matrix:
setup:
browser: [safari]
version: [11]
version: [11]
6 changes: 6 additions & 0 deletions .buildkite/pipeline.full.yml
Original file line number Diff line number Diff line change
@@ -1,16 +1,22 @@
agents:
queue: macos

steps:

#
# Upload all full pipelines
#
- label: ":pipeline_upload: Full browser pipeline"
timeout_in_minutes: 2
commands:
- buildkite-agent pipeline upload .buildkite/browser-pipeline.full.yml

- label: ":pipeline_upload: Full react native pipeline"
timeout_in_minutes: 2
commands:
- buildkite-agent pipeline upload .buildkite/react-native-pipeline.full.yml

- label: ":pipeline_upload: Full react native navigation pipeline"
timeout_in_minutes: 2
commands:
- buildkite-agent pipeline upload .buildkite/react-native-navigation-pipeline.full.yml
10 changes: 9 additions & 1 deletion .buildkite/pipeline.yml
Original file line number Diff line number Diff line change
@@ -1,9 +1,14 @@
agents:
queue: macos

steps:

#
# License audit
#
- label: ":copyright: License Audit"
agents:
queue: opensource
timeout_in_minutes: 20
plugins:
- docker-compose#v4.12.0:
Expand All @@ -13,20 +18,23 @@ steps:
# Upload each basic pipeline
#
- label: ":pipeline_upload: Basic browser pipeline"
timeout_in_minutes: 2
commands:
- buildkite-agent pipeline upload .buildkite/browser-pipeline.yml

- label: ":pipeline_upload: React Native pipeline"
timeout_in_minutes: 2
commands:
- buildkite-agent pipeline upload .buildkite/react-native-pipeline.yml

- label: ":pipeline_upload: React Native Navigation pipeline"
timeout_in_minutes: 2
commands:
- buildkite-agent pipeline upload .buildkite/react-native-navigation-pipeline.yml

#
# Conditionally trigger full pipeline
#
- label: 'Conditionally trigger full set of tests'
timeout_in_minutes: 30
timeout_in_minutes: 2
command: sh -c .buildkite/pipeline_trigger.sh
20 changes: 10 additions & 10 deletions .buildkite/react-native-navigation-pipeline.full.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
# This pipeline file builds runs the end-to-end tests for
# React Native Navigation on BitBar.
agents:
queue: opensource

steps:
- group: "React Native Navigation Tests"
Expand All @@ -9,7 +11,7 @@ steps:
# ------------------------------
- label: ":building_construction: :android: Build react-native-navigation test fixture - RN {{matrix.rn_version}} (Old Arch)"
key: "build-react-native-navigation-android-fixture-old-arch-full"
timeout_in_minutes: 30
timeout_in_minutes: 15
agents:
queue: macos-12-arm
env:
Expand All @@ -35,7 +37,7 @@ steps:

- label: ":building_construction: :android: Build react-native-navigation test fixture - RN {{matrix.rn_version}} (New Arch)"
key: "build-react-native-navigation-android-fixture-new-arch-full"
timeout_in_minutes: 30
timeout_in_minutes: 15
agents:
queue: macos-12-arm
env:
Expand Down Expand Up @@ -64,7 +66,7 @@ steps:
# ------------------------------
- label: ':building_construction: :mac: Build react-native-navigation test fixture - RN {{matrix.rn_version}} (Old Arch)'
key: "build-react-native-navigation-ios-fixture-old-arch-full"
timeout_in_minutes: 30
timeout_in_minutes: 15
agents:
queue: "macos-12-arm"
env:
Expand All @@ -90,7 +92,7 @@ steps:

- label: ':building_construction: :mac: Build react-native-navigation test fixture - RN {{matrix.rn_version}} (New Arch)'
key: "build-react-native-navigation-ios-fixture-new-arch-full"
timeout_in_minutes: 30
timeout_in_minutes: 15
agents:
queue: "macos-12-arm"
env:
Expand Down Expand Up @@ -119,7 +121,7 @@ steps:
# ------------------------------
- label: ":bitbar: :android: react-native-navigation end-to-end tests - RN {{matrix.rn_version}} (Old Arch) Android {{matrix.android_version}}"
depends_on: "build-react-native-navigation-android-fixture-old-arch-full"
timeout_in_minutes: 60
timeout_in_minutes: 30
env:
REACT_NATIVE_NAVIGATION: "true"
plugins:
Expand Down Expand Up @@ -160,7 +162,7 @@ steps:

- label: ":bitbar: :android: react-native-navigation end-to-end tests - RN {{matrix.rn_version}} (New Arch) Android {{matrix.android_version}}"
depends_on: "build-react-native-navigation-android-fixture-new-arch-full"
timeout_in_minutes: 60
timeout_in_minutes: 30
env:
REACT_NATIVE_NAVIGATION: "true"
RCT_NEW_ARCH_ENABLED: "true"
Expand Down Expand Up @@ -204,7 +206,7 @@ steps:
# ------------------------------
- label: ":bitbar: :mac: react-native-navigation end-to-end tests - RN {{matrix.rn_version}} (Old Arch) iOS {{matrix.ios_version}}"
depends_on: "build-react-native-navigation-ios-fixture-old-arch-full"
timeout_in_minutes: 60
timeout_in_minutes: 30
env:
REACT_NATIVE_NAVIGATION: "true"
plugins:
Expand All @@ -222,7 +224,6 @@ steps:
- --device=IOS_{{matrix.ios_version}}
- --a11y-locator
- --fail-fast
- --appium-version=1.22
- --no-tunnel
- --aws-public-ip
test-collector#v1.10.2:
Expand All @@ -245,7 +246,7 @@ steps:

- label: ":bitbar: :mac: react-native-navigation end-to-end tests - RN {{matrix.rn_version}} (New Arch) iOS {{matrix.ios_version}}"
depends_on: "build-react-native-navigation-ios-fixture-new-arch-full"
timeout_in_minutes: 60
timeout_in_minutes: 30
env:
REACT_NATIVE_NAVIGATION: "true"
RCT_NEW_ARCH_ENABLED: "true"
Expand All @@ -264,7 +265,6 @@ steps:
- --device=IOS_{{matrix.ios_version}}
- --a11y-locator
- --fail-fast
- --appium-version=1.22
- --no-tunnel
- --aws-public-ip
test-collector#v1.10.2:
Expand Down
18 changes: 10 additions & 8 deletions .buildkite/react-native-navigation-pipeline.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
# This pipeline file builds runs the end-to-end tests for
# React Native Navigation on BitBar.
agents:
queue: opensource

steps:
- group: "React Native Navigation Tests"
Expand All @@ -8,7 +10,7 @@ steps:
# ------------------------------
- label: ":building_construction: :android: Build react-native-navigation test fixture - RN {{matrix.rn_version}} (Old Arch)"
key: "build-react-native-navigation-android-fixture-old-arch"
timeout_in_minutes: 30
timeout_in_minutes: 15
agents:
queue: macos-12-arm
env:
Expand All @@ -34,7 +36,7 @@ steps:

- label: ":building_construction: :android: Build react-native-navigation test fixture - RN {{matrix.rn_version}} (New Arch)"
key: "build-react-native-navigation-android-fixture-new-arch"
timeout_in_minutes: 30
timeout_in_minutes: 15
agents:
queue: macos-12-arm
env:
Expand Down Expand Up @@ -63,7 +65,7 @@ steps:
# ------------------------------
- label: ":building_construction: :mac: Build react-native-navigation test fixture - RN {{matrix.rn_version}} (Old Arch)"
key: "build-react-native-navigation-ios-fixture-old-arch"
timeout_in_minutes: 30
timeout_in_minutes: 15
agents:
queue: "macos-12-arm"
env:
Expand All @@ -89,7 +91,7 @@ steps:

- label: ":building_construction: :mac: Build react-native-navigation test fixture - RN {{matrix.rn_version}} (New Arch)"
key: "build-react-native-navigation-ios-fixture-new-arch"
timeout_in_minutes: 30
timeout_in_minutes: 15
agents:
queue: "macos-12-arm"
env:
Expand Down Expand Up @@ -118,7 +120,7 @@ steps:
# ------------------------------
- label: ":bitbar: :android: react-native-navigation end-to-end tests - RN {{matrix.rn_version}} (Old Arch) / Android {{matrix.android_version}} "
depends_on: "build-react-native-navigation-android-fixture-old-arch"
timeout_in_minutes: 60
timeout_in_minutes: 30
env:
REACT_NATIVE_NAVIGATION: "true"
plugins:
Expand Down Expand Up @@ -159,7 +161,7 @@ steps:

- label: ":bitbar: :android: react-native-navigation end-to-end tests - RN {{matrix.rn_version}} (New Arch) / Android {{matrix.android_version}}"
depends_on: "build-react-native-navigation-android-fixture-new-arch"
timeout_in_minutes: 60
timeout_in_minutes: 30
env:
REACT_NATIVE_NAVIGATION: "true"
RCT_NEW_ARCH_ENABLED: "true"
Expand Down Expand Up @@ -203,7 +205,7 @@ steps:
# ------------------------------
- label: ":bitbar: :mac: react-native-navigation end-to-end tests - RN {{matrix.rn_version}} (Old Arch) / iOS {{matrix.ios_version}}"
depends_on: "build-react-native-navigation-ios-fixture-old-arch"
timeout_in_minutes: 60
timeout_in_minutes: 30
env:
REACT_NATIVE_NAVIGATION: "true"
plugins:
Expand Down Expand Up @@ -244,7 +246,7 @@ steps:

- label: ":bitbar: :mac: react-native-navigation end-to-end tests - RN {{matrix.rn_version}} (New Arch) / iOS {{matrix.ios_version}} react-native-navigation end-to-end tests"
depends_on: "build-react-native-navigation-ios-fixture-new-arch"
timeout_in_minutes: 60
timeout_in_minutes: 30
env:
REACT_NATIVE_NAVIGATION: "true"
RCT_NEW_ARCH_ENABLED: "true"
Expand Down
19 changes: 11 additions & 8 deletions .buildkite/react-native-pipeline.full.yml
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
agents:
queue: "opensource"

steps:
- group: "React Native Tests"
steps:
Expand All @@ -6,7 +9,7 @@ steps:
#
- label: ':android: Build RN {{matrix.reactnative}} 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:
Expand Down Expand Up @@ -39,7 +42,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:
Expand All @@ -65,7 +68,7 @@ steps:

- label: ':mac: Build RN {{matrix}} test fixture ipa (Old Arch)'
key: "build-react-native-ios-fixture-old-arch-full"
timeout_in_minutes: 30
timeout_in_minutes: 15
agents:
queue: "macos-14"
env:
Expand All @@ -92,7 +95,7 @@ steps:

- label: ':mac: Build RN {{matrix}} test fixture ipa (New Arch)'
key: "build-react-native-ios-fixture-new-arch-full"
timeout_in_minutes: 30
timeout_in_minutes: 15
agents:
queue: "macos-14"
env:
Expand Down Expand Up @@ -122,7 +125,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"
Expand Down Expand Up @@ -160,7 +163,7 @@ steps:

- 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"
Expand Down Expand Up @@ -199,7 +202,7 @@ steps:

- label: ":bitbar: :mac: RN {{matrix}} iOS 14 (Old Arch) end-to-end tests"
depends_on: "build-react-native-ios-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}}/output/reactnative.ipa"
Expand Down Expand Up @@ -237,7 +240,7 @@ steps:

- label: ":bitbar: :mac: RN {{matrix}} iOS 14 (New Arch) end-to-end tests"
depends_on: "build-react-native-ios-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}}/output/reactnative.ipa"
Expand Down
11 changes: 7 additions & 4 deletions .buildkite/react-native-pipeline.yml
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
agents:
queue: "opensource"

steps:
- group: "React Native Tests"
steps:
Expand Down Expand Up @@ -107,7 +110,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: 20
plugins:
artifacts#v1.9.0:
download: "test/react-native/features/fixtures/generated/old-arch/{{matrix}}/reactnative.apk"
Expand Down Expand Up @@ -141,7 +144,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: 20
plugins:
artifacts#v1.9.0:
download: "test/react-native/features/fixtures/generated/new-arch/{{matrix}}/reactnative.apk"
Expand Down Expand Up @@ -177,7 +180,7 @@ steps:

- label: ":bitbar: :mac: RN {{matrix}} iOS 14 (Old Arch) end-to-end tests"
depends_on: "build-react-native-ios-fixture-old-arch"
timeout_in_minutes: 60
timeout_in_minutes: 20
plugins:
artifacts#v1.9.0:
download: "test/react-native/features/fixtures/generated/old-arch/{{matrix}}/output/reactnative.ipa"
Expand Down Expand Up @@ -211,7 +214,7 @@ steps:

- label: ":bitbar: :mac: RN {{matrix}} iOS 14 (New Arch) end-to-end tests"
depends_on: "build-react-native-ios-fixture-new-arch"
timeout_in_minutes: 60
timeout_in_minutes: 20
plugins:
artifacts#v1.9.0:
download: "test/react-native/features/fixtures/generated/new-arch/{{matrix}}/output/reactnative.ipa"
Expand Down

0 comments on commit 3d29865

Please sign in to comment.