Skip to content

Commit 7ab42ff

Browse files
HenrikPoulsenSourcegraph
andauthored
Use slough artifactory for choco installs in yamato jobs (#8055)
Co-authored-by: Sourcegraph <[email protected]>
1 parent 314ade5 commit 7ab42ff

9 files changed

+38
-38
lines changed

.yamato/_templates.yml

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ pre_pack_hdrp_template_Win_trunk:
1414
image: package-ci/win10:v4.30.0
1515
flavor: b1.large
1616
commands:
17-
- choco install unity-downloader-cli -y -s https://artifactory.prd.it.unity3d.com/artifactory/api/nuget/unity-choco-local
17+
- choco install unity-downloader-cli -y -s https://artifactory-slo.bf.unity3d.com/artifactory/api/nuget/choco
1818
- unity-downloader-cli --source-file unity_revision.txt -c editor --wait --published-only
1919
- .Editor\Unity.exe -projectPath com.unity.template-hd -batchmode -quit -logFile ./Editor.log
2020
dependencies:
@@ -53,7 +53,7 @@ test_hdrp_template_Win_trunk:
5353
- .yamato/_editor_priming.yml#editor:priming:trunk:Win
5454
commands:
5555
- npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm
56-
- choco install unity-downloader-cli -y -s https://artifactory.prd.it.unity3d.com/artifactory/api/nuget/unity-choco-local
56+
- choco install unity-downloader-cli -y -s https://artifactory-slo.bf.unity3d.com/artifactory/api/nuget/choco
5757
- unity-downloader-cli --source-file unity_revision.txt -c editor --wait --published-only
5858
- upm-ci template test -u .\.Editor --project-path com.unity.template-hd
5959
artifacts:
@@ -156,7 +156,7 @@ pre_pack_hdrp_template_Win_CUSTOM-REVISION:
156156
image: package-ci/win10:v4.30.0
157157
flavor: b1.large
158158
commands:
159-
- choco install unity-downloader-cli -y -s https://artifactory.prd.it.unity3d.com/artifactory/api/nuget/unity-choco-local
159+
- choco install unity-downloader-cli -y -s https://artifactory-slo.bf.unity3d.com/artifactory/api/nuget/choco
160160
- unity-downloader-cli --source-file unity_revision.txt -c editor --wait --published-only
161161
- .Editor\Unity.exe -projectPath com.unity.template-hd -batchmode -quit -logFile ./Editor.log
162162
dependencies:
@@ -195,7 +195,7 @@ test_hdrp_template_Win_CUSTOM-REVISION:
195195
- .yamato/_editor_priming.yml#editor:priming:CUSTOM-REVISION:Win
196196
commands:
197197
- npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm
198-
- choco install unity-downloader-cli -y -s https://artifactory.prd.it.unity3d.com/artifactory/api/nuget/unity-choco-local
198+
- choco install unity-downloader-cli -y -s https://artifactory-slo.bf.unity3d.com/artifactory/api/nuget/choco
199199
- unity-downloader-cli --source-file unity_revision.txt -c editor --wait --published-only
200200
- upm-ci template test -u .\.Editor --project-path com.unity.template-hd
201201
artifacts:
@@ -306,7 +306,7 @@ pre_pack_hdrp_blank_template_Win_trunk:
306306
image: package-ci/win10:v4.30.0
307307
flavor: b1.large
308308
commands:
309-
- choco install unity-downloader-cli -y -s https://artifactory.prd.it.unity3d.com/artifactory/api/nuget/unity-choco-local
309+
- choco install unity-downloader-cli -y -s https://artifactory-slo.bf.unity3d.com/artifactory/api/nuget/choco
310310
- unity-downloader-cli --source-file unity_revision.txt -c editor --wait --published-only
311311
- .Editor\Unity.exe -projectPath com.unity.template.hdrp-blank -batchmode -quit -logFile ./Editor.log
312312
dependencies:
@@ -345,7 +345,7 @@ test_hdrp_blank_template_Win_trunk:
345345
- .yamato/_editor_priming.yml#editor:priming:trunk:Win
346346
commands:
347347
- npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm
348-
- choco install unity-downloader-cli -y -s https://artifactory.prd.it.unity3d.com/artifactory/api/nuget/unity-choco-local
348+
- choco install unity-downloader-cli -y -s https://artifactory-slo.bf.unity3d.com/artifactory/api/nuget/choco
349349
- unity-downloader-cli --source-file unity_revision.txt -c editor --wait --published-only
350350
- upm-ci template test -u .\.Editor --project-path com.unity.template.hdrp-blank
351351
artifacts:
@@ -448,7 +448,7 @@ pre_pack_hdrp_blank_template_Win_CUSTOM-REVISION:
448448
image: package-ci/win10:v4.30.0
449449
flavor: b1.large
450450
commands:
451-
- choco install unity-downloader-cli -y -s https://artifactory.prd.it.unity3d.com/artifactory/api/nuget/unity-choco-local
451+
- choco install unity-downloader-cli -y -s https://artifactory-slo.bf.unity3d.com/artifactory/api/nuget/choco
452452
- unity-downloader-cli --source-file unity_revision.txt -c editor --wait --published-only
453453
- .Editor\Unity.exe -projectPath com.unity.template.hdrp-blank -batchmode -quit -logFile ./Editor.log
454454
dependencies:
@@ -487,7 +487,7 @@ test_hdrp_blank_template_Win_CUSTOM-REVISION:
487487
- .yamato/_editor_priming.yml#editor:priming:CUSTOM-REVISION:Win
488488
commands:
489489
- npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm
490-
- choco install unity-downloader-cli -y -s https://artifactory.prd.it.unity3d.com/artifactory/api/nuget/unity-choco-local
490+
- choco install unity-downloader-cli -y -s https://artifactory-slo.bf.unity3d.com/artifactory/api/nuget/choco
491491
- unity-downloader-cli --source-file unity_revision.txt -c editor --wait --published-only
492492
- upm-ci template test -u .\.Editor --project-path com.unity.template.hdrp-blank
493493
artifacts:
@@ -598,7 +598,7 @@ pre_pack_universal_template_Win_trunk:
598598
image: package-ci/win10:v4.30.0
599599
flavor: b1.large
600600
commands:
601-
- choco install unity-downloader-cli -y -s https://artifactory.prd.it.unity3d.com/artifactory/api/nuget/unity-choco-local
601+
- choco install unity-downloader-cli -y -s https://artifactory-slo.bf.unity3d.com/artifactory/api/nuget/choco
602602
- unity-downloader-cli --source-file unity_revision.txt -c editor --wait --published-only
603603
- .Editor\Unity.exe -projectPath com.unity.template-universal -batchmode -quit -logFile ./Editor.log
604604
dependencies:
@@ -637,7 +637,7 @@ test_universal_template_Win_trunk:
637637
- .yamato/_editor_priming.yml#editor:priming:trunk:Win
638638
commands:
639639
- npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm
640-
- choco install unity-downloader-cli -y -s https://artifactory.prd.it.unity3d.com/artifactory/api/nuget/unity-choco-local
640+
- choco install unity-downloader-cli -y -s https://artifactory-slo.bf.unity3d.com/artifactory/api/nuget/choco
641641
- unity-downloader-cli --source-file unity_revision.txt -c editor --wait --published-only
642642
- upm-ci template test -u .\.Editor --project-path com.unity.template-universal
643643
artifacts:
@@ -740,7 +740,7 @@ pre_pack_universal_template_Win_CUSTOM-REVISION:
740740
image: package-ci/win10:v4.30.0
741741
flavor: b1.large
742742
commands:
743-
- choco install unity-downloader-cli -y -s https://artifactory.prd.it.unity3d.com/artifactory/api/nuget/unity-choco-local
743+
- choco install unity-downloader-cli -y -s https://artifactory-slo.bf.unity3d.com/artifactory/api/nuget/choco
744744
- unity-downloader-cli --source-file unity_revision.txt -c editor --wait --published-only
745745
- .Editor\Unity.exe -projectPath com.unity.template-universal -batchmode -quit -logFile ./Editor.log
746746
dependencies:
@@ -779,7 +779,7 @@ test_universal_template_Win_CUSTOM-REVISION:
779779
- .yamato/_editor_priming.yml#editor:priming:CUSTOM-REVISION:Win
780780
commands:
781781
- npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm
782-
- choco install unity-downloader-cli -y -s https://artifactory.prd.it.unity3d.com/artifactory/api/nuget/unity-choco-local
782+
- choco install unity-downloader-cli -y -s https://artifactory-slo.bf.unity3d.com/artifactory/api/nuget/choco
783783
- unity-downloader-cli --source-file unity_revision.txt -c editor --wait --published-only
784784
- upm-ci template test -u .\.Editor --project-path com.unity.template-universal
785785
artifacts:

.yamato/config/__shared.metafile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -295,7 +295,7 @@ platforms:
295295
del revdate.tmp
296296
utr <UTR_FLAGS> & exit 0
297297
unity_downloader_cli:
298-
- command: gsudo choco install unity-downloader-cli -y -s https://artifactory.prd.it.unity3d.com/artifactory/api/nuget/unity-choco-local
298+
- command: gsudo choco install unity-downloader-cli -y -s https://artifactory-slo.bf.unity3d.com/artifactory/api/nuget/choco
299299
retries: 2
300300
- command: unity-downloader-cli <EDITOR_REVISION_CMD> <COMPONENTS> --wait --published-only
301301
retries: 2

.yamato/config/urp_template.metafile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ reuse_blocks:
55
unity_downloader_cli:
66
- [all]: <shared.platform.commands.setup_utr>
77
- [Win_DX11, Win_DX12, Win_Vulkan]:
8-
- command: gsudo choco install unity-downloader-cli -y -s https://artifactory.prd.it.unity3d.com/artifactory/api/nuget/unity-choco-local
8+
- command: gsudo choco install unity-downloader-cli -y -s https://artifactory-slo.bf.unity3d.com/artifactory/api/nuget/choco
99
retries: 2
1010
- command: unity-downloader-cli <EDITOR_REVISION_CMD> -c editor --wait --published-only
1111
retries: 2

.yamato/postprocessing-win-dx11.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ PostProcessing_Win_DX11_playmode_mono_Linear_trunk:
2323
commands:
2424
- command: curl -s https://artifactory.prd.it.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr.bat --output utr.bat
2525
retries: 2
26-
- command: gsudo choco install unity-downloader-cli -y -s https://artifactory.prd.it.unity3d.com/artifactory/api/nuget/unity-choco-local
26+
- command: gsudo choco install unity-downloader-cli -y -s https://artifactory-slo.bf.unity3d.com/artifactory/api/nuget/choco
2727
retries: 2
2828
- command: unity-downloader-cli --source-file unity_revision.txt -c editor -c il2cpp --wait --published-only
2929
retries: 2
@@ -88,7 +88,7 @@ Build_PostProcessing_Win_DX11_Standalone_mono_Linear_trunk:
8888
commands:
8989
- command: curl -s https://artifactory.prd.it.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr.bat --output utr.bat
9090
retries: 2
91-
- command: gsudo choco install unity-downloader-cli -y -s https://artifactory.prd.it.unity3d.com/artifactory/api/nuget/unity-choco-local
91+
- command: gsudo choco install unity-downloader-cli -y -s https://artifactory-slo.bf.unity3d.com/artifactory/api/nuget/choco
9292
retries: 2
9393
- command: unity-downloader-cli --source-file unity_revision.txt -c editor -c il2cpp --wait --published-only
9494
retries: 2
@@ -125,7 +125,7 @@ PostProcessing_Win_DX11_playmode_mono_Linear_CUSTOM-REVISION:
125125
commands:
126126
- command: curl -s https://artifactory.prd.it.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr.bat --output utr.bat
127127
retries: 2
128-
- command: gsudo choco install unity-downloader-cli -y -s https://artifactory.prd.it.unity3d.com/artifactory/api/nuget/unity-choco-local
128+
- command: gsudo choco install unity-downloader-cli -y -s https://artifactory-slo.bf.unity3d.com/artifactory/api/nuget/choco
129129
retries: 2
130130
- command: unity-downloader-cli --source-file unity_revision.txt -c editor -c il2cpp --wait --published-only
131131
retries: 2
@@ -190,7 +190,7 @@ Build_PostProcessing_Win_DX11_Standalone_mono_Linear_CUSTOM-REVISION:
190190
commands:
191191
- command: curl -s https://artifactory.prd.it.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr.bat --output utr.bat
192192
retries: 2
193-
- command: gsudo choco install unity-downloader-cli -y -s https://artifactory.prd.it.unity3d.com/artifactory/api/nuget/unity-choco-local
193+
- command: gsudo choco install unity-downloader-cli -y -s https://artifactory-slo.bf.unity3d.com/artifactory/api/nuget/choco
194194
retries: 2
195195
- command: unity-downloader-cli --source-file unity_revision.txt -c editor -c il2cpp --wait --published-only
196196
retries: 2

.yamato/postprocessing-win-dx12.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ PostProcessing_Win_DX12_playmode_mono_Linear_trunk:
2323
commands:
2424
- command: curl -s https://artifactory.prd.it.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr.bat --output utr.bat
2525
retries: 2
26-
- command: gsudo choco install unity-downloader-cli -y -s https://artifactory.prd.it.unity3d.com/artifactory/api/nuget/unity-choco-local
26+
- command: gsudo choco install unity-downloader-cli -y -s https://artifactory-slo.bf.unity3d.com/artifactory/api/nuget/choco
2727
retries: 2
2828
- command: unity-downloader-cli --source-file unity_revision.txt -c editor -c il2cpp --wait --published-only
2929
retries: 2
@@ -88,7 +88,7 @@ Build_PostProcessing_Win_DX12_Standalone_mono_Linear_trunk:
8888
commands:
8989
- command: curl -s https://artifactory.prd.it.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr.bat --output utr.bat
9090
retries: 2
91-
- command: gsudo choco install unity-downloader-cli -y -s https://artifactory.prd.it.unity3d.com/artifactory/api/nuget/unity-choco-local
91+
- command: gsudo choco install unity-downloader-cli -y -s https://artifactory-slo.bf.unity3d.com/artifactory/api/nuget/choco
9292
retries: 2
9393
- command: unity-downloader-cli --source-file unity_revision.txt -c editor -c il2cpp --wait --published-only
9494
retries: 2
@@ -125,7 +125,7 @@ PostProcessing_Win_DX12_playmode_mono_Linear_CUSTOM-REVISION:
125125
commands:
126126
- command: curl -s https://artifactory.prd.it.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr.bat --output utr.bat
127127
retries: 2
128-
- command: gsudo choco install unity-downloader-cli -y -s https://artifactory.prd.it.unity3d.com/artifactory/api/nuget/unity-choco-local
128+
- command: gsudo choco install unity-downloader-cli -y -s https://artifactory-slo.bf.unity3d.com/artifactory/api/nuget/choco
129129
retries: 2
130130
- command: unity-downloader-cli --source-file unity_revision.txt -c editor -c il2cpp --wait --published-only
131131
retries: 2
@@ -190,7 +190,7 @@ Build_PostProcessing_Win_DX12_Standalone_mono_Linear_CUSTOM-REVISION:
190190
commands:
191191
- command: curl -s https://artifactory.prd.it.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr.bat --output utr.bat
192192
retries: 2
193-
- command: gsudo choco install unity-downloader-cli -y -s https://artifactory.prd.it.unity3d.com/artifactory/api/nuget/unity-choco-local
193+
- command: gsudo choco install unity-downloader-cli -y -s https://artifactory-slo.bf.unity3d.com/artifactory/api/nuget/choco
194194
retries: 2
195195
- command: unity-downloader-cli --source-file unity_revision.txt -c editor -c il2cpp --wait --published-only
196196
retries: 2

.yamato/postprocessing-win-vulkan.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ PostProcessing_Win_Vulkan_playmode_mono_Linear_trunk:
2323
commands:
2424
- command: curl -s https://artifactory.prd.it.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr.bat --output utr.bat
2525
retries: 2
26-
- command: gsudo choco install unity-downloader-cli -y -s https://artifactory.prd.it.unity3d.com/artifactory/api/nuget/unity-choco-local
26+
- command: gsudo choco install unity-downloader-cli -y -s https://artifactory-slo.bf.unity3d.com/artifactory/api/nuget/choco
2727
retries: 2
2828
- command: unity-downloader-cli --source-file unity_revision.txt -c editor -c il2cpp --wait --published-only
2929
retries: 2
@@ -88,7 +88,7 @@ Build_PostProcessing_Win_Vulkan_Standalone_mono_Linear_trunk:
8888
commands:
8989
- command: curl -s https://artifactory.prd.it.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr.bat --output utr.bat
9090
retries: 2
91-
- command: gsudo choco install unity-downloader-cli -y -s https://artifactory.prd.it.unity3d.com/artifactory/api/nuget/unity-choco-local
91+
- command: gsudo choco install unity-downloader-cli -y -s https://artifactory-slo.bf.unity3d.com/artifactory/api/nuget/choco
9292
retries: 2
9393
- command: unity-downloader-cli --source-file unity_revision.txt -c editor -c il2cpp --wait --published-only
9494
retries: 2
@@ -125,7 +125,7 @@ PostProcessing_Win_Vulkan_playmode_mono_Linear_CUSTOM-REVISION:
125125
commands:
126126
- command: curl -s https://artifactory.prd.it.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr.bat --output utr.bat
127127
retries: 2
128-
- command: gsudo choco install unity-downloader-cli -y -s https://artifactory.prd.it.unity3d.com/artifactory/api/nuget/unity-choco-local
128+
- command: gsudo choco install unity-downloader-cli -y -s https://artifactory-slo.bf.unity3d.com/artifactory/api/nuget/choco
129129
retries: 2
130130
- command: unity-downloader-cli --source-file unity_revision.txt -c editor -c il2cpp --wait --published-only
131131
retries: 2
@@ -190,7 +190,7 @@ Build_PostProcessing_Win_Vulkan_Standalone_mono_Linear_CUSTOM-REVISION:
190190
commands:
191191
- command: curl -s https://artifactory.prd.it.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr.bat --output utr.bat
192192
retries: 2
193-
- command: gsudo choco install unity-downloader-cli -y -s https://artifactory.prd.it.unity3d.com/artifactory/api/nuget/unity-choco-local
193+
- command: gsudo choco install unity-downloader-cli -y -s https://artifactory-slo.bf.unity3d.com/artifactory/api/nuget/choco
194194
retries: 2
195195
- command: unity-downloader-cli --source-file unity_revision.txt -c editor -c il2cpp --wait --published-only
196196
retries: 2

.yamato/urp_template-win-dx11.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ URP_Template_Win_DX11_playmode_mono_Linear_trunk:
2323
commands:
2424
- command: curl -s https://artifactory.prd.it.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr.bat --output utr.bat
2525
retries: 2
26-
- command: gsudo choco install unity-downloader-cli -y -s https://artifactory.prd.it.unity3d.com/artifactory/api/nuget/unity-choco-local
26+
- command: gsudo choco install unity-downloader-cli -y -s https://artifactory-slo.bf.unity3d.com/artifactory/api/nuget/choco
2727
retries: 2
2828
- command: unity-downloader-cli --source-file unity_revision.txt -c editor -c il2cpp --wait --published-only
2929
retries: 2
@@ -88,7 +88,7 @@ Build_URP_Template_Win_DX11_Standalone_mono_Linear_trunk:
8888
commands:
8989
- command: curl -s https://artifactory.prd.it.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr.bat --output utr.bat
9090
retries: 2
91-
- command: gsudo choco install unity-downloader-cli -y -s https://artifactory.prd.it.unity3d.com/artifactory/api/nuget/unity-choco-local
91+
- command: gsudo choco install unity-downloader-cli -y -s https://artifactory-slo.bf.unity3d.com/artifactory/api/nuget/choco
9292
retries: 2
9393
- command: unity-downloader-cli --source-file unity_revision.txt -c editor --wait --published-only
9494
retries: 2
@@ -125,7 +125,7 @@ URP_Template_Win_DX11_playmode_mono_Linear_CUSTOM-REVISION:
125125
commands:
126126
- command: curl -s https://artifactory.prd.it.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr.bat --output utr.bat
127127
retries: 2
128-
- command: gsudo choco install unity-downloader-cli -y -s https://artifactory.prd.it.unity3d.com/artifactory/api/nuget/unity-choco-local
128+
- command: gsudo choco install unity-downloader-cli -y -s https://artifactory-slo.bf.unity3d.com/artifactory/api/nuget/choco
129129
retries: 2
130130
- command: unity-downloader-cli --source-file unity_revision.txt -c editor -c il2cpp --wait --published-only
131131
retries: 2
@@ -190,7 +190,7 @@ Build_URP_Template_Win_DX11_Standalone_mono_Linear_CUSTOM-REVISION:
190190
commands:
191191
- command: curl -s https://artifactory.prd.it.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr.bat --output utr.bat
192192
retries: 2
193-
- command: gsudo choco install unity-downloader-cli -y -s https://artifactory.prd.it.unity3d.com/artifactory/api/nuget/unity-choco-local
193+
- command: gsudo choco install unity-downloader-cli -y -s https://artifactory-slo.bf.unity3d.com/artifactory/api/nuget/choco
194194
retries: 2
195195
- command: unity-downloader-cli --source-file unity_revision.txt -c editor --wait --published-only
196196
retries: 2

0 commit comments

Comments
 (0)