Skip to content

[2021.2] Change android build image #5773

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 7 commits into from
Sep 23, 2021
Merged

[2021.2] Change android build image #5773

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
23a6fee
Change android build image
Sep 23, 2021
4c4b8b6
Update perf_build_editmode images
Sep 23, 2021
0908552
Set android var in commands, update vv image
Sep 23, 2021
56cae15
Revert "Set android var in commands, update vv image"
Sep 23, 2021
b7c3704
Revert perf changes
Sep 23, 2021
66b264f
Revert vv changes
Sep 23, 2021
633e615
Fix reverts
Sep 23, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .yamato/config/__shared.metafile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,7 @@ test_platforms:
after:
- [OSX_OpenGlCore, OSX_Metal, iPhone_Metal, Android_OpenGLES3, Android_Vulkan, XRQuest_OpenGLES3, XRQuest_Vulkan, Linux_OpenGlCore, Linux_Vulkan]: <shared.platform.commands.log_parser>
after_build:
- [OSX_OpenGlCore, iPhone_Metal, Android_OpenGLES3, Android_Vulkan, XRQuest_OpenGLES3, XRQuest_Vulkan, Linux_OpenGlCore, Linux_Vulkan]: <shared.platform.commands.log_parser>
- [OSX_OpenGlCore, iPhone_Metal, XRQuest_OpenGLES3, XRQuest_Vulkan, Linux_OpenGlCore, Linux_Vulkan]: <shared.platform.commands.log_parser>
- type: playmode
allow_cache: True
utr_flags:
Expand Down Expand Up @@ -397,7 +397,7 @@ platforms:
flavor: b1.large
standalone_build:
type: Unity::VM
image: mobile/android-execution-r19:stable
image: sdet/gamecode_win10:stable
flavor: b1.large
commands:
[OpenGLES3, Vulkan]:
Expand Down
2 changes: 1 addition & 1 deletion .yamato/script/gfx_sdet_tools_revision.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
83513b1518a8c43db2e2a009ca37e8a7f55c5196
6acd136c0762743d489b003b1c0bc94d2ef03fb8
10 changes: 2 additions & 8 deletions .yamato/shadergraph-android-opengles3.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ Build_ShaderGraph_Android_OpenGLES3_Standalone_il2cpp_Linear_2021.2:
name: Build ShaderGraph on Android_OpenGLES3_il2cpp_Linear_Standalone_build_Player on version 2021.2
agent:
type: Unity::VM
image: mobile/android-execution-r19:stable
image: sdet/gamecode_win10:stable
flavor: b1.large
variables:
UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates
Expand All @@ -74,9 +74,6 @@ Build_ShaderGraph_Android_OpenGLES3_Standalone_il2cpp_Linear_2021.2:
echo %GIT_REVISIONDATE%
del revdate.tmp
utr %CACHE_ARGS% --architecture=ARM64 --artifacts_path=TestProjects/ShaderGraph/test-results --build-only --editor-location=./WindowsEditor --extra-editor-arg="-colorspace=Linear" --extra-editor-arg="-executemethod" --extra-editor-arg="SetupProject.ApplySettings" --extra-editor-arg="gles3" --extra-editor-arg="Linear" --extra-editor-arg="-playergraphicsapi=OpenGLES3" --platform=Android --player-save-path=players --scripting-backend=IL2CPP --suite=playmode --testfilter=%TEST_FILTER% --testproject=./TestProjects/ShaderGraph --timeout=2700
after:
- command: pip install requests --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade
- command: python .yamato/script/log_scripts/log_parser.py
artifacts:
logs:
paths:
Expand Down Expand Up @@ -132,7 +129,7 @@ Build_ShaderGraph_Android_OpenGLES3_Standalone_il2cpp_Linear_CUSTOM-REVISION:
name: Build ShaderGraph on Android_OpenGLES3_il2cpp_Linear_Standalone_build_Player on version CUSTOM-REVISION
agent:
type: Unity::VM
image: mobile/android-execution-r19:stable
image: sdet/gamecode_win10:stable
flavor: b1.large
variables:
UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates
Expand All @@ -154,9 +151,6 @@ Build_ShaderGraph_Android_OpenGLES3_Standalone_il2cpp_Linear_CUSTOM-REVISION:
echo %GIT_REVISIONDATE%
del revdate.tmp
utr %CACHE_ARGS% --architecture=ARM64 --artifacts_path=TestProjects/ShaderGraph/test-results --build-only --editor-location=./WindowsEditor --extra-editor-arg="-colorspace=Linear" --extra-editor-arg="-executemethod" --extra-editor-arg="SetupProject.ApplySettings" --extra-editor-arg="gles3" --extra-editor-arg="Linear" --extra-editor-arg="-playergraphicsapi=OpenGLES3" --platform=Android --player-save-path=players --scripting-backend=IL2CPP --suite=playmode --testfilter=%TEST_FILTER% --testproject=./TestProjects/ShaderGraph --timeout=2700
after:
- command: pip install requests --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade
- command: python .yamato/script/log_scripts/log_parser.py
artifacts:
logs:
paths:
Expand Down
10 changes: 2 additions & 8 deletions .yamato/shadergraph-android-vulkan.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ Build_ShaderGraph_Android_Vulkan_Standalone_il2cpp_Linear_2021.2:
name: Build ShaderGraph on Android_Vulkan_il2cpp_Linear_Standalone_build_Player on version 2021.2
agent:
type: Unity::VM
image: mobile/android-execution-r19:stable
image: sdet/gamecode_win10:stable
flavor: b1.large
variables:
UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates
Expand All @@ -74,9 +74,6 @@ Build_ShaderGraph_Android_Vulkan_Standalone_il2cpp_Linear_2021.2:
echo %GIT_REVISIONDATE%
del revdate.tmp
utr %CACHE_ARGS% --architecture=ARM64 --artifacts_path=TestProjects/ShaderGraph/test-results --build-only --editor-location=./WindowsEditor --extra-editor-arg="-colorspace=Linear" --extra-editor-arg="-executemethod" --extra-editor-arg="SetupProject.ApplySettings" --extra-editor-arg="vulkan" --extra-editor-arg="Linear" --extra-editor-arg="-playergraphicsapi=Vulkan" --platform=Android --player-save-path=players --scripting-backend=IL2CPP --suite=playmode --testfilter=%TEST_FILTER% --testproject=./TestProjects/ShaderGraph --timeout=2700
after:
- command: pip install requests --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade
- command: python .yamato/script/log_scripts/log_parser.py
artifacts:
logs:
paths:
Expand Down Expand Up @@ -132,7 +129,7 @@ Build_ShaderGraph_Android_Vulkan_Standalone_il2cpp_Linear_CUSTOM-REVISION:
name: Build ShaderGraph on Android_Vulkan_il2cpp_Linear_Standalone_build_Player on version CUSTOM-REVISION
agent:
type: Unity::VM
image: mobile/android-execution-r19:stable
image: sdet/gamecode_win10:stable
flavor: b1.large
variables:
UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates
Expand All @@ -154,9 +151,6 @@ Build_ShaderGraph_Android_Vulkan_Standalone_il2cpp_Linear_CUSTOM-REVISION:
echo %GIT_REVISIONDATE%
del revdate.tmp
utr %CACHE_ARGS% --architecture=ARM64 --artifacts_path=TestProjects/ShaderGraph/test-results --build-only --editor-location=./WindowsEditor --extra-editor-arg="-colorspace=Linear" --extra-editor-arg="-executemethod" --extra-editor-arg="SetupProject.ApplySettings" --extra-editor-arg="vulkan" --extra-editor-arg="Linear" --extra-editor-arg="-playergraphicsapi=Vulkan" --platform=Android --player-save-path=players --scripting-backend=IL2CPP --suite=playmode --testfilter=%TEST_FILTER% --testproject=./TestProjects/ShaderGraph --timeout=2700
after:
- command: pip install requests --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade
- command: python .yamato/script/log_scripts/log_parser.py
artifacts:
logs:
paths:
Expand Down
10 changes: 2 additions & 8 deletions .yamato/universal_hybrid-android-opengles3.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ Build_Universal_Hybrid_Android_OpenGLES3_Standalone_mono_Linear_2021.2:
name: Build Universal_Hybrid on Android_OpenGLES3_mono_Linear_Standalone_build_Player on version 2021.2
agent:
type: Unity::VM
image: mobile/android-execution-r19:stable
image: sdet/gamecode_win10:stable
flavor: b1.large
variables:
UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates
Expand All @@ -74,9 +74,6 @@ Build_Universal_Hybrid_Android_OpenGLES3_Standalone_mono_Linear_2021.2:
echo %GIT_REVISIONDATE%
del revdate.tmp
utr %CACHE_ARGS% --architecture=ARM64 --artifacts_path=TestProjects/UniversalHybridTest/test-results --build-only --compilation-errors-as-warnings --editor-location=./WindowsEditor --extra-editor-arg="-colorspace=Linear" --extra-editor-arg="-executemethod" --extra-editor-arg="SetupProject.ApplySettings" --extra-editor-arg="gles3" --extra-editor-arg="Linear" --extra-editor-arg="-playergraphicsapi=OpenGLES3" --platform=Android --player-save-path=players --scripting-backend=Mono2x --suite=playmode --testfilter=%TEST_FILTER% --testproject=./TestProjects/UniversalHybridTest --timeout=2700
after:
- command: pip install requests --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade
- command: python .yamato/script/log_scripts/log_parser.py
artifacts:
logs:
paths:
Expand Down Expand Up @@ -132,7 +129,7 @@ Build_Universal_Hybrid_Android_OpenGLES3_Standalone_mono_Linear_CUSTOM-REVISION:
name: Build Universal_Hybrid on Android_OpenGLES3_mono_Linear_Standalone_build_Player on version CUSTOM-REVISION
agent:
type: Unity::VM
image: mobile/android-execution-r19:stable
image: sdet/gamecode_win10:stable
flavor: b1.large
variables:
UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates
Expand All @@ -154,9 +151,6 @@ Build_Universal_Hybrid_Android_OpenGLES3_Standalone_mono_Linear_CUSTOM-REVISION:
echo %GIT_REVISIONDATE%
del revdate.tmp
utr %CACHE_ARGS% --architecture=ARM64 --artifacts_path=TestProjects/UniversalHybridTest/test-results --build-only --compilation-errors-as-warnings --editor-location=./WindowsEditor --extra-editor-arg="-colorspace=Linear" --extra-editor-arg="-executemethod" --extra-editor-arg="SetupProject.ApplySettings" --extra-editor-arg="gles3" --extra-editor-arg="Linear" --extra-editor-arg="-playergraphicsapi=OpenGLES3" --platform=Android --player-save-path=players --scripting-backend=Mono2x --suite=playmode --testfilter=%TEST_FILTER% --testproject=./TestProjects/UniversalHybridTest --timeout=2700
after:
- command: pip install requests --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade
- command: python .yamato/script/log_scripts/log_parser.py
artifacts:
logs:
paths:
Expand Down
10 changes: 2 additions & 8 deletions .yamato/universal_hybrid-android-vulkan.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ Build_Universal_Hybrid_Android_Vulkan_Standalone_mono_Linear_2021.2:
name: Build Universal_Hybrid on Android_Vulkan_mono_Linear_Standalone_build_Player on version 2021.2
agent:
type: Unity::VM
image: mobile/android-execution-r19:stable
image: sdet/gamecode_win10:stable
flavor: b1.large
variables:
UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates
Expand All @@ -74,9 +74,6 @@ Build_Universal_Hybrid_Android_Vulkan_Standalone_mono_Linear_2021.2:
echo %GIT_REVISIONDATE%
del revdate.tmp
utr %CACHE_ARGS% --architecture=ARM64 --artifacts_path=TestProjects/UniversalHybridTest/test-results --build-only --compilation-errors-as-warnings --editor-location=./WindowsEditor --extra-editor-arg="-colorspace=Linear" --extra-editor-arg="-executemethod" --extra-editor-arg="SetupProject.ApplySettings" --extra-editor-arg="vulkan" --extra-editor-arg="Linear" --extra-editor-arg="-playergraphicsapi=Vulkan" --platform=Android --player-save-path=players --scripting-backend=Mono2x --suite=playmode --testfilter=%TEST_FILTER% --testproject=./TestProjects/UniversalHybridTest --timeout=2700
after:
- command: pip install requests --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade
- command: python .yamato/script/log_scripts/log_parser.py
artifacts:
logs:
paths:
Expand Down Expand Up @@ -132,7 +129,7 @@ Build_Universal_Hybrid_Android_Vulkan_Standalone_mono_Linear_CUSTOM-REVISION:
name: Build Universal_Hybrid on Android_Vulkan_mono_Linear_Standalone_build_Player on version CUSTOM-REVISION
agent:
type: Unity::VM
image: mobile/android-execution-r19:stable
image: sdet/gamecode_win10:stable
flavor: b1.large
variables:
UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates
Expand All @@ -154,9 +151,6 @@ Build_Universal_Hybrid_Android_Vulkan_Standalone_mono_Linear_CUSTOM-REVISION:
echo %GIT_REVISIONDATE%
del revdate.tmp
utr %CACHE_ARGS% --architecture=ARM64 --artifacts_path=TestProjects/UniversalHybridTest/test-results --build-only --compilation-errors-as-warnings --editor-location=./WindowsEditor --extra-editor-arg="-colorspace=Linear" --extra-editor-arg="-executemethod" --extra-editor-arg="SetupProject.ApplySettings" --extra-editor-arg="vulkan" --extra-editor-arg="Linear" --extra-editor-arg="-playergraphicsapi=Vulkan" --platform=Android --player-save-path=players --scripting-backend=Mono2x --suite=playmode --testfilter=%TEST_FILTER% --testproject=./TestProjects/UniversalHybridTest --timeout=2700
after:
- command: pip install requests --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade
- command: python .yamato/script/log_scripts/log_parser.py
artifacts:
logs:
paths:
Expand Down
10 changes: 2 additions & 8 deletions .yamato/urp_2d-android-opengles3.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ Build_URP_2D_Android_OpenGLES3_Standalone_il2cpp_Linear_2021.2:
name: Build URP_2D on Android_OpenGLES3_il2cpp_Linear_Standalone_build_Player on version 2021.2
agent:
type: Unity::VM
image: mobile/android-execution-r19:stable
image: sdet/gamecode_win10:stable
flavor: b1.large
variables:
UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates
Expand All @@ -74,9 +74,6 @@ Build_URP_2D_Android_OpenGLES3_Standalone_il2cpp_Linear_2021.2:
echo %GIT_REVISIONDATE%
del revdate.tmp
utr %CACHE_ARGS% --architecture=ARM64 --artifacts_path=TestProjects/UniversalGraphicsTest_2D/test-results --build-only --editor-location=./WindowsEditor --extra-editor-arg="-colorspace=Linear" --extra-editor-arg="-executemethod" --extra-editor-arg="SetupProject.ApplySettings" --extra-editor-arg="gles3" --extra-editor-arg="Linear" --extra-editor-arg="-playergraphicsapi=OpenGLES3" --platform=Android --player-save-path=players --scripting-backend=IL2CPP --suite=playmode --testfilter=%TEST_FILTER% --testproject=./TestProjects/UniversalGraphicsTest_2D --timeout=3000
after:
- command: pip install requests --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade
- command: python .yamato/script/log_scripts/log_parser.py
artifacts:
logs:
paths:
Expand Down Expand Up @@ -132,7 +129,7 @@ Build_URP_2D_Android_OpenGLES3_Standalone_il2cpp_Linear_CUSTOM-REVISION:
name: Build URP_2D on Android_OpenGLES3_il2cpp_Linear_Standalone_build_Player on version CUSTOM-REVISION
agent:
type: Unity::VM
image: mobile/android-execution-r19:stable
image: sdet/gamecode_win10:stable
flavor: b1.large
variables:
UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates
Expand All @@ -154,9 +151,6 @@ Build_URP_2D_Android_OpenGLES3_Standalone_il2cpp_Linear_CUSTOM-REVISION:
echo %GIT_REVISIONDATE%
del revdate.tmp
utr %CACHE_ARGS% --architecture=ARM64 --artifacts_path=TestProjects/UniversalGraphicsTest_2D/test-results --build-only --editor-location=./WindowsEditor --extra-editor-arg="-colorspace=Linear" --extra-editor-arg="-executemethod" --extra-editor-arg="SetupProject.ApplySettings" --extra-editor-arg="gles3" --extra-editor-arg="Linear" --extra-editor-arg="-playergraphicsapi=OpenGLES3" --platform=Android --player-save-path=players --scripting-backend=IL2CPP --suite=playmode --testfilter=%TEST_FILTER% --testproject=./TestProjects/UniversalGraphicsTest_2D --timeout=3000
after:
- command: pip install requests --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade
- command: python .yamato/script/log_scripts/log_parser.py
artifacts:
logs:
paths:
Expand Down
10 changes: 2 additions & 8 deletions .yamato/urp_2d-android-vulkan.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ Build_URP_2D_Android_Vulkan_Standalone_il2cpp_Linear_2021.2:
name: Build URP_2D on Android_Vulkan_il2cpp_Linear_Standalone_build_Player on version 2021.2
agent:
type: Unity::VM
image: mobile/android-execution-r19:stable
image: sdet/gamecode_win10:stable
flavor: b1.large
variables:
UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates
Expand All @@ -74,9 +74,6 @@ Build_URP_2D_Android_Vulkan_Standalone_il2cpp_Linear_2021.2:
echo %GIT_REVISIONDATE%
del revdate.tmp
utr %CACHE_ARGS% --architecture=ARM64 --artifacts_path=TestProjects/UniversalGraphicsTest_2D/test-results --build-only --editor-location=./WindowsEditor --extra-editor-arg="-colorspace=Linear" --extra-editor-arg="-executemethod" --extra-editor-arg="SetupProject.ApplySettings" --extra-editor-arg="vulkan" --extra-editor-arg="Linear" --extra-editor-arg="-playergraphicsapi=Vulkan" --platform=Android --player-save-path=players --scripting-backend=IL2CPP --suite=playmode --testfilter=%TEST_FILTER% --testproject=./TestProjects/UniversalGraphicsTest_2D --timeout=3000
after:
- command: pip install requests --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade
- command: python .yamato/script/log_scripts/log_parser.py
artifacts:
logs:
paths:
Expand Down Expand Up @@ -132,7 +129,7 @@ Build_URP_2D_Android_Vulkan_Standalone_il2cpp_Linear_CUSTOM-REVISION:
name: Build URP_2D on Android_Vulkan_il2cpp_Linear_Standalone_build_Player on version CUSTOM-REVISION
agent:
type: Unity::VM
image: mobile/android-execution-r19:stable
image: sdet/gamecode_win10:stable
flavor: b1.large
variables:
UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates
Expand All @@ -154,9 +151,6 @@ Build_URP_2D_Android_Vulkan_Standalone_il2cpp_Linear_CUSTOM-REVISION:
echo %GIT_REVISIONDATE%
del revdate.tmp
utr %CACHE_ARGS% --architecture=ARM64 --artifacts_path=TestProjects/UniversalGraphicsTest_2D/test-results --build-only --editor-location=./WindowsEditor --extra-editor-arg="-colorspace=Linear" --extra-editor-arg="-executemethod" --extra-editor-arg="SetupProject.ApplySettings" --extra-editor-arg="vulkan" --extra-editor-arg="Linear" --extra-editor-arg="-playergraphicsapi=Vulkan" --platform=Android --player-save-path=players --scripting-backend=IL2CPP --suite=playmode --testfilter=%TEST_FILTER% --testproject=./TestProjects/UniversalGraphicsTest_2D --timeout=3000
after:
- command: pip install requests --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade
- command: python .yamato/script/log_scripts/log_parser.py
artifacts:
logs:
paths:
Expand Down
Loading