Skip to content
This repository was archived by the owner on Oct 20, 2021. It is now read-only.

Commit fcb578d

Browse files
author
Paul Balaji
authored
Enable Accelerator (#273)
1 parent 66eef03 commit fcb578d

File tree

4 files changed

+33
-13
lines changed

4 files changed

+33
-13
lines changed

.buildkite/premerge.steps.yaml

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,8 @@ windows: &windows
3030
# Workaround for flaky Git clones, likely due to - https://github.com/PowerShell/Win32-OpenSSH/issues/1322
3131
- exit_status: 128
3232
limit: 3
33+
env: &windows-env
34+
ACCELERATOR_ENDPOINT: "unity-accelerator.production-intinf-eu1.i8e.io"
3335

3436
linux: &linux
3537
agents:
@@ -59,6 +61,8 @@ macos: &macos
5961
# This is designed to trap and retry failures because agent lost connection. Agent exits with -1 in this case.
6062
- exit_status: -1
6163
limit: 3
64+
env: &macos-env
65+
ACCELERATOR_ENDPOINT: "172.16.100.150"
6266

6367
# NOTE: step labels turn into commit-status names like {org}/{repo}/{pipeline}/{step-label}, lower-case and hyphenated.
6468
# These are then relied on to have stable names by other things, so once named, please beware renaming has consequences.
@@ -69,7 +73,7 @@ steps:
6973
- label: ":debian: ~ lint :lint-roller:"
7074
command: bash -c ci/lint.sh
7175
<<: *linux
72-
76+
7377
- label: ":windows: ~ test"
7478
id: "test"
7579
command: bash -c ci/test.sh
@@ -78,10 +82,10 @@ steps:
7882
- logs/**/*
7983

8084
- label: ":debian: ~ annotate test results :pencil2:"
81-
depends_on:
85+
depends_on:
8286
- step: "test"
8387
allow_failure: true
84-
plugins:
88+
plugins:
8589
- improbable/test-summary#d7289cac8297018fd1b452dcf828979307b3ebc6:
8690
inputs:
8791
- label: ":octagonal_sign: Test failures "
@@ -97,6 +101,7 @@ steps:
97101
artifact_paths:
98102
- logs/**/*
99103
env:
104+
<<: *windows-env
100105
WORKER_TYPE: "MobileClient"
101106
BUILD_ENVIRONMENT: "local"
102107
BUILD_TARGET_FILTER: "android"
@@ -108,6 +113,7 @@ steps:
108113
artifact_paths:
109114
- logs/**/*
110115
env:
116+
<<: *macos-env
111117
WORKER_TYPE: "MobileClient"
112118
BUILD_ENVIRONMENT: "local"
113119
BUILD_TARGET_FILTER: "ios"
@@ -120,6 +126,7 @@ steps:
120126
artifact_paths:
121127
- logs/**/*
122128
env:
129+
<<: *windows-env
123130
WORKER_TYPE: "UnityClient"
124131
BUILD_ENVIRONMENT: "cloud"
125132
SCRIPTING_BACKEND: "mono"
@@ -130,6 +137,7 @@ steps:
130137
artifact_paths:
131138
- logs/**/*
132139
env:
140+
<<: *windows-env
133141
WORKER_TYPE: "UnityClient"
134142
BUILD_ENVIRONMENT: "local"
135143
SCRIPTING_BACKEND: "il2cpp"
@@ -140,6 +148,7 @@ steps:
140148
artifact_paths:
141149
- logs/**/*
142150
env:
151+
<<: *windows-env
143152
WORKER_TYPE: "UnityGameLogic"
144153
BUILD_ENVIRONMENT: "cloud"
145154
SCRIPTING_BACKEND: "mono"
@@ -150,6 +159,7 @@ steps:
150159
artifact_paths:
151160
- logs/**/*
152161
env:
162+
<<: *windows-env
153163
WORKER_TYPE: "SimulatedPlayerCoordinator"
154164
BUILD_ENVIRONMENT: "cloud"
155165
SCRIPTING_BACKEND: "mono"

.buildkite/release-qa.steps.yaml

Lines changed: 15 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
# You may find the example pipeline steps listed here helpful: https://buildkite.com/docs/pipelines/defining-steps#example-pipeline but please
88
# note that the setup is already done, so you should not manually adjust anything through the BuildKite interface.
99
#
10-
common: &common
10+
windows: &windows
1111
agents:
1212
- "capable_of_building=gdk-for-unity"
1313
- "environment=production"
@@ -30,77 +30,84 @@ common: &common
3030
# Workaround for flaky Git clones, likely due to - https://github.com/PowerShell/Win32-OpenSSH/issues/1322
3131
- exit_status: 128
3232
limit: 3
33+
env: &windows-env
34+
ACCELERATOR_ENDPOINT: "unity-accelerator.production-intinf-eu1.i8e.io"
3335

3436
# NOTE: step labels turn into commit-status names like {org}/{repo}/{pipeline}/{step-label}, lower-case and hyphenated.
3537
# These are then relied on to have stable names by other things, so once named, please beware renaming has consequences.
3638

3739
steps:
3840
- label: "test"
3941
command: bash -c ci/test.sh
40-
<<: *common
42+
<<: *windows
4143
artifact_paths:
4244
- logs/**/*
4345

4446
- label: "build :android:"
4547
command: bash -c .shared-ci/scripts/build-worker.sh
46-
<<: *common
48+
<<: *windows
4749
artifact_paths:
4850
- logs/**/*
4951
- build/assembly/**/*
5052
env:
53+
<<: *windows-env
5154
WORKER_TYPE: "MobileClient"
5255
BUILD_ENVIRONMENT: "local"
5356
BUILD_TARGET_FILTER: "android"
5457
SCRIPTING_BACKEND: "mono"
5558

5659
- label: "build :ios:"
5760
command: bash -c .shared-ci/scripts/build-worker.sh
58-
<<: *common
61+
<<: *windows
5962
artifact_paths:
6063
- logs/**/*
6164
- build/assembly/**/*
6265
env:
66+
<<: *windows-env
6367
WORKER_TYPE: "MobileClient"
6468
BUILD_ENVIRONMENT: "local"
6569
BUILD_TARGET_FILTER: "ios"
6670
SCRIPTING_BACKEND: "il2cpp"
6771

6872
- label: "build UnityClient mono"
6973
command: bash -c .shared-ci/scripts/build-worker.sh
70-
<<: *common
74+
<<: *windows
7175
artifact_paths:
7276
- logs/**/*
7377
- build/assembly/**/*
7478
env:
79+
<<: *windows-env
7580
WORKER_TYPE: "UnityClient"
7681
BUILD_ENVIRONMENT: "cloud"
7782
SCRIPTING_BACKEND: "mono"
7883

7984
- label: "build UnityGameLogic mono"
8085
command: bash -c .shared-ci/scripts/build-worker.sh
81-
<<: *common
86+
<<: *windows
8287
artifact_paths:
8388
- logs/**/*
8489
- build/assembly/**/*
8590
env:
91+
<<: *windows-env
8692
WORKER_TYPE: "UnityGameLogic"
8793
BUILD_ENVIRONMENT: "cloud"
8894
SCRIPTING_BACKEND: "mono"
8995

9096
- label: "build SimulatedPlayerCoordinator mono"
9197
command: bash -c .shared-ci/scripts/build-worker.sh
92-
<<: *common
98+
<<: *windows
9399
artifact_paths:
94100
- logs/**/*
95101
- build/assembly/**/*
96102
env:
103+
<<: *windows-env
97104
WORKER_TYPE: "SimulatedPlayerCoordinator"
98105
BUILD_ENVIRONMENT: "cloud"
99106
SCRIPTING_BACKEND: "mono"
100107
- wait
101108
- label: Launch deployments
102109
command: bash -c ci/launch.sh
103-
<<: *common
110+
<<: *windows
104111
env:
105112
ASSEMBLY_PREFIX: "fps"
106113
PROJECT_NAME: "unity_gdk"

ci/shared-ci.pinned

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
master 7980ef5db74d8db47c0f683378a38d64accd2c0a
1+
master f802ed7

ci/test.sh

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,8 @@ cd "$(dirname "$0")/../"
1010

1111
source .shared-ci/scripts/pinned-tools.sh
1212

13+
ACCELERATOR_ARGS=$(getAcceleratorArgs)
14+
1315
PROJECT_DIR="$(pwd)"
1416
mkdir -p "${PROJECT_DIR}/logs/"
1517

@@ -24,5 +26,6 @@ pushd "workers/unity"
2426
-runEditorTests \
2527
-logfile "${PROJECT_DIR}/logs/unity-editmode-test-run.log" \
2628
-editorTestsResultFile "${EDITMODE_TEST_RESULTS_FILE}" \
27-
-editorTestsFilter Fps
29+
-editorTestsFilter Fps \
30+
"${ACCELERATOR_ARGS}"
2831
popd

0 commit comments

Comments
 (0)