diff --git a/.yamato/all-lightmapper.yml b/.yamato/all-lightmapping.yml similarity index 50% rename from .yamato/all-lightmapper.yml rename to .yamato/all-lightmapping.yml index a57e7b7f43d..70c08e38c9c 100644 --- a/.yamato/all-lightmapper.yml +++ b/.yamato/all-lightmapping.yml @@ -7,79 +7,79 @@ --- -PR_LightMapper_trunk: - name: PR LightMapper on trunk +PR_Lightmapping_trunk: + name: PR Lightmapping on trunk variables: CUSTOM_REVISION: '{{trunk.changeset.id}}' UTR_VERSION: "current" TEST_FILTER: .* CACHE_ARGS: '{{cache.flags}}' dependencies: - - path: .yamato/lightmapper-win-dx11.yml#LightMapper_Win_DX11_editmode_mono_Linear_trunk + - path: .yamato/lightmapping-win-dx11.yml#Lightmapping_Win_DX11_editmode_mono_Linear_trunk rerun: on_new_revision - - path: .yamato/lightmapper-win-dx11.yml#LightMapper_Win_DX11_Standalone_mono_Linear_trunk + - path: .yamato/lightmapping-win-dx11.yml#Lightmapping_Win_DX11_Standalone_mono_Linear_trunk rerun: on_new_revision - - path: .yamato/lightmapper-linux-vulkan.yml#LightMapper_Linux_Vulkan_editmode_mono_Linear_trunk + - path: .yamato/lightmapping-linux-vulkan.yml#Lightmapping_Linux_Vulkan_editmode_mono_Linear_trunk rerun: on_new_revision - - path: .yamato/lightmapper-linux-vulkan.yml#LightMapper_Linux_Vulkan_Standalone_mono_Linear_trunk + - path: .yamato/lightmapping-linux-vulkan.yml#Lightmapping_Linux_Vulkan_Standalone_mono_Linear_trunk rerun: on_new_revision - - path: .yamato/lightmapper-linux-openglcore.yml#LightMapper_Linux_OpenGlCore_editmode_mono_Linear_trunk + - path: .yamato/lightmapping-linux-openglcore.yml#Lightmapping_Linux_OpenGlCore_editmode_mono_Linear_trunk rerun: on_new_revision -Extra_LightMapper_trunk: - name: Extra LightMapper on trunk +Extra_Lightmapping_trunk: + name: Extra Lightmapping on trunk variables: CUSTOM_REVISION: '{{trunk.changeset.id}}' UTR_VERSION: "current" TEST_FILTER: .* CACHE_ARGS: '{{cache.flags}}' dependencies: [] -LightMapper_trunk: - name: LightMapper on trunk +Lightmapping_trunk: + name: Lightmapping on trunk variables: CUSTOM_REVISION: '{{trunk.changeset.id}}' UTR_VERSION: "current" TEST_FILTER: .* CACHE_ARGS: '{{cache.flags}}' dependencies: - - path: .yamato/all-lightmapper.yml#PR_LightMapper_trunk + - path: .yamato/all-lightmapping.yml#PR_Lightmapping_trunk rerun: on_new_revision - - path: .yamato/all-lightmapper.yml#Extra_LightMapper_trunk + - path: .yamato/all-lightmapping.yml#Extra_Lightmapping_trunk rerun: on_new_revision -PR_LightMapper_CUSTOM-REVISION: - name: PR LightMapper on CUSTOM-REVISION +PR_Lightmapping_CUSTOM-REVISION: + name: PR Lightmapping on CUSTOM-REVISION variables: CUSTOM_REVISION: custom_revision_not_set UTR_VERSION: "current" TEST_FILTER: .* CACHE_ARGS: '{{cache.flags}}' dependencies: - - path: .yamato/lightmapper-win-dx11.yml#LightMapper_Win_DX11_editmode_mono_Linear_CUSTOM-REVISION + - path: .yamato/lightmapping-win-dx11.yml#Lightmapping_Win_DX11_editmode_mono_Linear_CUSTOM-REVISION rerun: on_new_revision - - path: .yamato/lightmapper-win-dx11.yml#LightMapper_Win_DX11_Standalone_mono_Linear_CUSTOM-REVISION + - path: .yamato/lightmapping-win-dx11.yml#Lightmapping_Win_DX11_Standalone_mono_Linear_CUSTOM-REVISION rerun: on_new_revision - - path: .yamato/lightmapper-linux-vulkan.yml#LightMapper_Linux_Vulkan_editmode_mono_Linear_CUSTOM-REVISION + - path: .yamato/lightmapping-linux-vulkan.yml#Lightmapping_Linux_Vulkan_editmode_mono_Linear_CUSTOM-REVISION rerun: on_new_revision - - path: .yamato/lightmapper-linux-vulkan.yml#LightMapper_Linux_Vulkan_Standalone_mono_Linear_CUSTOM-REVISION + - path: .yamato/lightmapping-linux-vulkan.yml#Lightmapping_Linux_Vulkan_Standalone_mono_Linear_CUSTOM-REVISION rerun: on_new_revision - - path: .yamato/lightmapper-linux-openglcore.yml#LightMapper_Linux_OpenGlCore_editmode_mono_Linear_CUSTOM-REVISION + - path: .yamato/lightmapping-linux-openglcore.yml#Lightmapping_Linux_OpenGlCore_editmode_mono_Linear_CUSTOM-REVISION rerun: on_new_revision -Extra_LightMapper_CUSTOM-REVISION: - name: Extra LightMapper on CUSTOM-REVISION +Extra_Lightmapping_CUSTOM-REVISION: + name: Extra Lightmapping on CUSTOM-REVISION variables: CUSTOM_REVISION: custom_revision_not_set UTR_VERSION: "current" TEST_FILTER: .* CACHE_ARGS: '{{cache.flags}}' dependencies: [] -LightMapper_CUSTOM-REVISION: - name: LightMapper on CUSTOM-REVISION +Lightmapping_CUSTOM-REVISION: + name: Lightmapping on CUSTOM-REVISION variables: CUSTOM_REVISION: custom_revision_not_set UTR_VERSION: "current" TEST_FILTER: .* CACHE_ARGS: '{{cache.flags}}' dependencies: - - path: .yamato/all-lightmapper.yml#PR_LightMapper_CUSTOM-REVISION + - path: .yamato/all-lightmapping.yml#PR_Lightmapping_CUSTOM-REVISION rerun: on_new_revision - - path: .yamato/all-lightmapper.yml#Extra_LightMapper_CUSTOM-REVISION + - path: .yamato/all-lightmapping.yml#Extra_Lightmapping_CUSTOM-REVISION rerun: on_new_revision diff --git a/.yamato/config/lightmapper.metafile b/.yamato/config/lightmapping.metafile similarity index 98% rename from .yamato/config/lightmapper.metafile rename to .yamato/config/lightmapping.metafile index c06503fe4f2..fa47fbaf585 100644 --- a/.yamato/config/lightmapper.metafile +++ b/.yamato/config/lightmapping.metafile @@ -1,6 +1,6 @@ project: - name: LightMapper - folder: LightMapper + name: Lightmapping + folder: Lightmapping test_platforms: - type: editmode diff --git a/.yamato/lightmapper-linux-openglcore.yml b/.yamato/lightmapping-linux-openglcore.yml similarity index 76% rename from .yamato/lightmapper-linux-openglcore.yml rename to .yamato/lightmapping-linux-openglcore.yml index eaedb28188f..c4cbcd749b5 100644 --- a/.yamato/lightmapper-linux-openglcore.yml +++ b/.yamato/lightmapping-linux-openglcore.yml @@ -7,8 +7,8 @@ --- -LightMapper_Linux_OpenGlCore_editmode_mono_Linear_trunk: - name: LightMapper on Linux_OpenGlCore_editmode_mono_Linear on version trunk +Lightmapping_Linux_OpenGlCore_editmode_mono_Linear_trunk: + name: Lightmapping on Linux_OpenGlCore_editmode_mono_Linear on version trunk agent: type: Unity::VM::GPU image: package-ci/ubuntu:stable @@ -33,7 +33,7 @@ LightMapper_Linux_OpenGlCore_editmode_mono_Linear_trunk: - command: sudo unity-downloader-cli --source-file unity_revision.txt -c editor -c il2cpp --wait --published-only retries: 2 - command: sudo apt-get install -y ocl-icd-opencl-dev - - command: DISPLAY=:0.0 ./utr --artifacts_path=TestProjects/LightMapper/test-results --editor-location=.Editor --extra-editor-arg="-colorspace=Linear" --extra-editor-arg="-force-glcore" --platform=editmode --scripting-backend=Mono2x --suite=editor --testfilter=$TEST_FILTER --testproject=./TestProjects/LightMapper --zero-tests-are-ok=1 + - command: DISPLAY=:0.0 ./utr --artifacts_path=TestProjects/Lightmapping/test-results --editor-location=.Editor --extra-editor-arg="-colorspace=Linear" --extra-editor-arg="-force-glcore" --platform=editmode --scripting-backend=Mono2x --suite=editor --testfilter=$TEST_FILTER --testproject=./TestProjects/Lightmapping --zero-tests-are-ok=1 after: - command: pip3 install ant_instability_detection --index-url https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade || exit 0 - command: find_instabilities || exit 0 @@ -41,12 +41,12 @@ LightMapper_Linux_OpenGlCore_editmode_mono_Linear_trunk: logs: paths: - "**/test-results/**" - - "TestProjects/LightMapper/Logs/*.log" + - "TestProjects/Lightmapping/Logs/*.log" dependencies: - path: .yamato/_editor_priming.yml#editor:priming:trunk:Linux rerun: on_new_revision -LightMapper_Linux_OpenGlCore_Standalone_mono_Linear_trunk: - name: LightMapper on Linux_OpenGlCore_Standalone_mono_Linear on version trunk +Lightmapping_Linux_OpenGlCore_Standalone_mono_Linear_trunk: + name: Lightmapping on Linux_OpenGlCore_Standalone_mono_Linear on version trunk agent: type: Unity::VM::GPU image: package-ci/ubuntu:stable @@ -63,7 +63,7 @@ LightMapper_Linux_OpenGlCore_Standalone_mono_Linear_trunk: retries: 2 - command: chmod +x utr - command: sudo apt-get install -y ocl-icd-opencl-dev - - command: DISPLAY=:0.0 ./utr --artifacts_path=TestProjects/LightMapper/test-results --platform=StandaloneLinux64 --player-connection-ip=auto --player-load-path=players --suite=playmode --timeout=1200 --zero-tests-are-ok=1 + - command: DISPLAY=:0.0 ./utr --artifacts_path=TestProjects/Lightmapping/test-results --platform=StandaloneLinux64 --player-connection-ip=auto --player-load-path=players --suite=playmode --timeout=1200 --zero-tests-are-ok=1 after: - command: pip3 install ant_instability_detection --index-url https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade || exit 0 - command: find_instabilities || exit 0 @@ -71,14 +71,14 @@ LightMapper_Linux_OpenGlCore_Standalone_mono_Linear_trunk: logs: paths: - "**/test-results/**" - - "TestProjects/LightMapper/Logs/*.log" + - "TestProjects/Lightmapping/Logs/*.log" dependencies: - path: .yamato/_editor_priming.yml#editor:priming:trunk:Linux rerun: on_new_revision - - path: .yamato/lightmapper-linux-openglcore.yml#Build_LightMapper_Linux_OpenGlCore_Standalone_mono_Linear_trunk + - path: .yamato/lightmapping-linux-openglcore.yml#Build_Lightmapping_Linux_OpenGlCore_Standalone_mono_Linear_trunk rerun: on_new_revision -Build_LightMapper_Linux_OpenGlCore_Standalone_mono_Linear_trunk: - name: Build LightMapper on Linux_OpenGlCore_mono_Linear_Standalone_build_Player on version trunk +Build_Lightmapping_Linux_OpenGlCore_Standalone_mono_Linear_trunk: + name: Build Lightmapping on Linux_OpenGlCore_mono_Linear_Standalone_build_Player on version trunk agent: type: Unity::VM::GPU image: package-ci/ubuntu:stable @@ -103,7 +103,7 @@ Build_LightMapper_Linux_OpenGlCore_Standalone_mono_Linear_trunk: - command: sudo unity-downloader-cli --source-file unity_revision.txt -c editor -c il2cpp --wait --published-only retries: 2 - command: sudo apt-get install -y ocl-icd-opencl-dev - - command: DISPLAY=:0.0 ./utr $CACHE_ARGS --artifacts_path=TestProjects/LightMapper/test-results --build-only --editor-location=.Editor --extra-editor-arg="-colorspace=Linear" --platform=StandaloneLinux64 --player-save-path=players --scripting-backend=Mono2x --suite=playmode --testfilter=$TEST_FILTER --testproject=./TestProjects/LightMapper --timeout=1200 + - command: DISPLAY=:0.0 ./utr $CACHE_ARGS --artifacts_path=TestProjects/Lightmapping/test-results --build-only --editor-location=.Editor --extra-editor-arg="-colorspace=Linear" --platform=StandaloneLinux64 --player-save-path=players --scripting-backend=Mono2x --suite=playmode --testfilter=$TEST_FILTER --testproject=./TestProjects/Lightmapping --timeout=1200 after: - command: pip3 install ant_instability_detection --index-url https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade || exit 0 - command: find_instabilities || exit 0 @@ -111,15 +111,15 @@ Build_LightMapper_Linux_OpenGlCore_Standalone_mono_Linear_trunk: logs: paths: - "**/test-results/**" - - "TestProjects/LightMapper/Logs/*.log" + - "TestProjects/Lightmapping/Logs/*.log" players: paths: - "players*/**" dependencies: - path: .yamato/_editor_priming.yml#editor:priming:trunk:Linux rerun: on_new_revision -LightMapper_Linux_OpenGlCore_editmode_mono_Linear_CUSTOM-REVISION: - name: LightMapper on Linux_OpenGlCore_editmode_mono_Linear on version CUSTOM-REVISION +Lightmapping_Linux_OpenGlCore_editmode_mono_Linear_CUSTOM-REVISION: + name: Lightmapping on Linux_OpenGlCore_editmode_mono_Linear on version CUSTOM-REVISION agent: type: Unity::VM::GPU image: package-ci/ubuntu:stable @@ -144,7 +144,7 @@ LightMapper_Linux_OpenGlCore_editmode_mono_Linear_CUSTOM-REVISION: - command: sudo unity-downloader-cli --source-file unity_revision.txt -c editor -c il2cpp --wait --published-only retries: 2 - command: sudo apt-get install -y ocl-icd-opencl-dev - - command: DISPLAY=:0.0 ./utr --artifacts_path=TestProjects/LightMapper/test-results --editor-location=.Editor --extra-editor-arg="-colorspace=Linear" --extra-editor-arg="-force-glcore" --platform=editmode --scripting-backend=Mono2x --suite=editor --testfilter=$TEST_FILTER --testproject=./TestProjects/LightMapper --zero-tests-are-ok=1 + - command: DISPLAY=:0.0 ./utr --artifacts_path=TestProjects/Lightmapping/test-results --editor-location=.Editor --extra-editor-arg="-colorspace=Linear" --extra-editor-arg="-force-glcore" --platform=editmode --scripting-backend=Mono2x --suite=editor --testfilter=$TEST_FILTER --testproject=./TestProjects/Lightmapping --zero-tests-are-ok=1 after: - command: pip3 install ant_instability_detection --index-url https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade || exit 0 - command: find_instabilities || exit 0 @@ -152,12 +152,12 @@ LightMapper_Linux_OpenGlCore_editmode_mono_Linear_CUSTOM-REVISION: logs: paths: - "**/test-results/**" - - "TestProjects/LightMapper/Logs/*.log" + - "TestProjects/Lightmapping/Logs/*.log" dependencies: - path: .yamato/_editor_priming.yml#editor:priming:CUSTOM-REVISION:Linux rerun: on_new_revision -LightMapper_Linux_OpenGlCore_Standalone_mono_Linear_CUSTOM-REVISION: - name: LightMapper on Linux_OpenGlCore_Standalone_mono_Linear on version CUSTOM-REVISION +Lightmapping_Linux_OpenGlCore_Standalone_mono_Linear_CUSTOM-REVISION: + name: Lightmapping on Linux_OpenGlCore_Standalone_mono_Linear on version CUSTOM-REVISION agent: type: Unity::VM::GPU image: package-ci/ubuntu:stable @@ -174,7 +174,7 @@ LightMapper_Linux_OpenGlCore_Standalone_mono_Linear_CUSTOM-REVISION: retries: 2 - command: chmod +x utr - command: sudo apt-get install -y ocl-icd-opencl-dev - - command: DISPLAY=:0.0 ./utr --artifacts_path=TestProjects/LightMapper/test-results --platform=StandaloneLinux64 --player-connection-ip=auto --player-load-path=players --suite=playmode --timeout=1200 --zero-tests-are-ok=1 + - command: DISPLAY=:0.0 ./utr --artifacts_path=TestProjects/Lightmapping/test-results --platform=StandaloneLinux64 --player-connection-ip=auto --player-load-path=players --suite=playmode --timeout=1200 --zero-tests-are-ok=1 after: - command: pip3 install ant_instability_detection --index-url https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade || exit 0 - command: find_instabilities || exit 0 @@ -182,14 +182,14 @@ LightMapper_Linux_OpenGlCore_Standalone_mono_Linear_CUSTOM-REVISION: logs: paths: - "**/test-results/**" - - "TestProjects/LightMapper/Logs/*.log" + - "TestProjects/Lightmapping/Logs/*.log" dependencies: - path: .yamato/_editor_priming.yml#editor:priming:CUSTOM-REVISION:Linux rerun: on_new_revision - - path: .yamato/lightmapper-linux-openglcore.yml#Build_LightMapper_Linux_OpenGlCore_Standalone_mono_Linear_CUSTOM-REVISION + - path: .yamato/lightmapping-linux-openglcore.yml#Build_Lightmapping_Linux_OpenGlCore_Standalone_mono_Linear_CUSTOM-REVISION rerun: on_new_revision -Build_LightMapper_Linux_OpenGlCore_Standalone_mono_Linear_CUSTOM-REVISION: - name: Build LightMapper on Linux_OpenGlCore_mono_Linear_Standalone_build_Player on version CUSTOM-REVISION +Build_Lightmapping_Linux_OpenGlCore_Standalone_mono_Linear_CUSTOM-REVISION: + name: Build Lightmapping on Linux_OpenGlCore_mono_Linear_Standalone_build_Player on version CUSTOM-REVISION agent: type: Unity::VM::GPU image: package-ci/ubuntu:stable @@ -214,7 +214,7 @@ Build_LightMapper_Linux_OpenGlCore_Standalone_mono_Linear_CUSTOM-REVISION: - command: sudo unity-downloader-cli --source-file unity_revision.txt -c editor -c il2cpp --wait --published-only retries: 2 - command: sudo apt-get install -y ocl-icd-opencl-dev - - command: DISPLAY=:0.0 ./utr $CACHE_ARGS --artifacts_path=TestProjects/LightMapper/test-results --build-only --editor-location=.Editor --extra-editor-arg="-colorspace=Linear" --platform=StandaloneLinux64 --player-save-path=players --scripting-backend=Mono2x --suite=playmode --testfilter=$TEST_FILTER --testproject=./TestProjects/LightMapper --timeout=1200 + - command: DISPLAY=:0.0 ./utr $CACHE_ARGS --artifacts_path=TestProjects/Lightmapping/test-results --build-only --editor-location=.Editor --extra-editor-arg="-colorspace=Linear" --platform=StandaloneLinux64 --player-save-path=players --scripting-backend=Mono2x --suite=playmode --testfilter=$TEST_FILTER --testproject=./TestProjects/Lightmapping --timeout=1200 after: - command: pip3 install ant_instability_detection --index-url https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade || exit 0 - command: find_instabilities || exit 0 @@ -222,7 +222,7 @@ Build_LightMapper_Linux_OpenGlCore_Standalone_mono_Linear_CUSTOM-REVISION: logs: paths: - "**/test-results/**" - - "TestProjects/LightMapper/Logs/*.log" + - "TestProjects/Lightmapping/Logs/*.log" players: paths: - "players*/**" diff --git a/.yamato/lightmapper-linux-vulkan.yml b/.yamato/lightmapping-linux-vulkan.yml similarity index 74% rename from .yamato/lightmapper-linux-vulkan.yml rename to .yamato/lightmapping-linux-vulkan.yml index 2486307e191..a36a044be7a 100644 --- a/.yamato/lightmapper-linux-vulkan.yml +++ b/.yamato/lightmapping-linux-vulkan.yml @@ -7,8 +7,8 @@ --- -LightMapper_Linux_Vulkan_editmode_mono_Linear_trunk: - name: LightMapper on Linux_Vulkan_editmode_mono_Linear on version trunk +Lightmapping_Linux_Vulkan_editmode_mono_Linear_trunk: + name: Lightmapping on Linux_Vulkan_editmode_mono_Linear on version trunk agent: type: Unity::VM::GPU image: package-ci/ubuntu:stable @@ -33,7 +33,7 @@ LightMapper_Linux_Vulkan_editmode_mono_Linear_trunk: - command: sudo unity-downloader-cli --source-file unity_revision.txt -c editor -c il2cpp --wait --published-only retries: 2 - command: sudo apt-get install -y ocl-icd-opencl-dev - - command: DISPLAY=:0.0 ./utr --artifacts_path=TestProjects/LightMapper/test-results --editor-location=.Editor --extra-editor-arg="-colorspace=Linear" --extra-editor-arg="-force-vulkan" --extra-editor-arg="-playergraphicsapi=Vulkan" --platform=editmode --scripting-backend=Mono2x --suite=editor --testfilter=$TEST_FILTER --testproject=./TestProjects/LightMapper --zero-tests-are-ok=1 + - command: DISPLAY=:0.0 ./utr --artifacts_path=TestProjects/Lightmapping/test-results --editor-location=.Editor --extra-editor-arg="-colorspace=Linear" --extra-editor-arg="-force-vulkan" --extra-editor-arg="-playergraphicsapi=Vulkan" --platform=editmode --scripting-backend=Mono2x --suite=editor --testfilter=$TEST_FILTER --testproject=./TestProjects/Lightmapping --zero-tests-are-ok=1 after: - command: pip3 install ant_instability_detection --index-url https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade || exit 0 - command: find_instabilities || exit 0 @@ -41,12 +41,12 @@ LightMapper_Linux_Vulkan_editmode_mono_Linear_trunk: logs: paths: - "**/test-results/**" - - "TestProjects/LightMapper/Logs/*.log" + - "TestProjects/Lightmapping/Logs/*.log" dependencies: - path: .yamato/_editor_priming.yml#editor:priming:trunk:Linux rerun: on_new_revision -LightMapper_Linux_Vulkan_Standalone_mono_Linear_trunk: - name: LightMapper on Linux_Vulkan_Standalone_mono_Linear on version trunk +Lightmapping_Linux_Vulkan_Standalone_mono_Linear_trunk: + name: Lightmapping on Linux_Vulkan_Standalone_mono_Linear on version trunk agent: type: Unity::VM::GPU image: package-ci/ubuntu:stable @@ -63,7 +63,7 @@ LightMapper_Linux_Vulkan_Standalone_mono_Linear_trunk: retries: 2 - command: chmod +x utr - command: sudo apt-get install -y ocl-icd-opencl-dev - - command: DISPLAY=:0.0 ./utr --artifacts_path=TestProjects/LightMapper/test-results --platform=StandaloneLinux64 --player-connection-ip=auto --player-load-path=players --suite=playmode --timeout=1200 --zero-tests-are-ok=1 + - command: DISPLAY=:0.0 ./utr --artifacts_path=TestProjects/Lightmapping/test-results --platform=StandaloneLinux64 --player-connection-ip=auto --player-load-path=players --suite=playmode --timeout=1200 --zero-tests-are-ok=1 after: - command: pip3 install ant_instability_detection --index-url https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade || exit 0 - command: find_instabilities || exit 0 @@ -71,14 +71,14 @@ LightMapper_Linux_Vulkan_Standalone_mono_Linear_trunk: logs: paths: - "**/test-results/**" - - "TestProjects/LightMapper/Logs/*.log" + - "TestProjects/Lightmapping/Logs/*.log" dependencies: - path: .yamato/_editor_priming.yml#editor:priming:trunk:Linux rerun: on_new_revision - - path: .yamato/lightmapper-linux-vulkan.yml#Build_LightMapper_Linux_Vulkan_Standalone_mono_Linear_trunk + - path: .yamato/lightmapping-linux-vulkan.yml#Build_Lightmapping_Linux_Vulkan_Standalone_mono_Linear_trunk rerun: on_new_revision -Build_LightMapper_Linux_Vulkan_Standalone_mono_Linear_trunk: - name: Build LightMapper on Linux_Vulkan_mono_Linear_Standalone_build_Player on version trunk +Build_Lightmapping_Linux_Vulkan_Standalone_mono_Linear_trunk: + name: Build Lightmapping on Linux_Vulkan_mono_Linear_Standalone_build_Player on version trunk agent: type: Unity::VM::GPU image: package-ci/ubuntu:stable @@ -103,7 +103,7 @@ Build_LightMapper_Linux_Vulkan_Standalone_mono_Linear_trunk: - command: sudo unity-downloader-cli --source-file unity_revision.txt -c editor -c il2cpp --wait --published-only retries: 2 - command: sudo apt-get install -y ocl-icd-opencl-dev - - command: DISPLAY=:0.0 ./utr $CACHE_ARGS --artifacts_path=TestProjects/LightMapper/test-results --build-only --editor-location=.Editor --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=StandaloneLinux64 --player-save-path=players --scripting-backend=Mono2x --suite=playmode --testfilter=$TEST_FILTER --testproject=./TestProjects/LightMapper --timeout=1200 + - command: DISPLAY=:0.0 ./utr $CACHE_ARGS --artifacts_path=TestProjects/Lightmapping/test-results --build-only --editor-location=.Editor --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=StandaloneLinux64 --player-save-path=players --scripting-backend=Mono2x --suite=playmode --testfilter=$TEST_FILTER --testproject=./TestProjects/Lightmapping --timeout=1200 after: - command: pip3 install ant_instability_detection --index-url https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade || exit 0 - command: find_instabilities || exit 0 @@ -111,15 +111,15 @@ Build_LightMapper_Linux_Vulkan_Standalone_mono_Linear_trunk: logs: paths: - "**/test-results/**" - - "TestProjects/LightMapper/Logs/*.log" + - "TestProjects/Lightmapping/Logs/*.log" players: paths: - "players*/**" dependencies: - path: .yamato/_editor_priming.yml#editor:priming:trunk:Linux rerun: on_new_revision -LightMapper_Linux_Vulkan_editmode_mono_Linear_CUSTOM-REVISION: - name: LightMapper on Linux_Vulkan_editmode_mono_Linear on version CUSTOM-REVISION +Lightmapping_Linux_Vulkan_editmode_mono_Linear_CUSTOM-REVISION: + name: Lightmapping on Linux_Vulkan_editmode_mono_Linear on version CUSTOM-REVISION agent: type: Unity::VM::GPU image: package-ci/ubuntu:stable @@ -144,7 +144,7 @@ LightMapper_Linux_Vulkan_editmode_mono_Linear_CUSTOM-REVISION: - command: sudo unity-downloader-cli --source-file unity_revision.txt -c editor -c il2cpp --wait --published-only retries: 2 - command: sudo apt-get install -y ocl-icd-opencl-dev - - command: DISPLAY=:0.0 ./utr --artifacts_path=TestProjects/LightMapper/test-results --editor-location=.Editor --extra-editor-arg="-colorspace=Linear" --extra-editor-arg="-force-vulkan" --extra-editor-arg="-playergraphicsapi=Vulkan" --platform=editmode --scripting-backend=Mono2x --suite=editor --testfilter=$TEST_FILTER --testproject=./TestProjects/LightMapper --zero-tests-are-ok=1 + - command: DISPLAY=:0.0 ./utr --artifacts_path=TestProjects/Lightmapping/test-results --editor-location=.Editor --extra-editor-arg="-colorspace=Linear" --extra-editor-arg="-force-vulkan" --extra-editor-arg="-playergraphicsapi=Vulkan" --platform=editmode --scripting-backend=Mono2x --suite=editor --testfilter=$TEST_FILTER --testproject=./TestProjects/Lightmapping --zero-tests-are-ok=1 after: - command: pip3 install ant_instability_detection --index-url https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade || exit 0 - command: find_instabilities || exit 0 @@ -152,12 +152,12 @@ LightMapper_Linux_Vulkan_editmode_mono_Linear_CUSTOM-REVISION: logs: paths: - "**/test-results/**" - - "TestProjects/LightMapper/Logs/*.log" + - "TestProjects/Lightmapping/Logs/*.log" dependencies: - path: .yamato/_editor_priming.yml#editor:priming:CUSTOM-REVISION:Linux rerun: on_new_revision -LightMapper_Linux_Vulkan_Standalone_mono_Linear_CUSTOM-REVISION: - name: LightMapper on Linux_Vulkan_Standalone_mono_Linear on version CUSTOM-REVISION +Lightmapping_Linux_Vulkan_Standalone_mono_Linear_CUSTOM-REVISION: + name: Lightmapping on Linux_Vulkan_Standalone_mono_Linear on version CUSTOM-REVISION agent: type: Unity::VM::GPU image: package-ci/ubuntu:stable @@ -174,7 +174,7 @@ LightMapper_Linux_Vulkan_Standalone_mono_Linear_CUSTOM-REVISION: retries: 2 - command: chmod +x utr - command: sudo apt-get install -y ocl-icd-opencl-dev - - command: DISPLAY=:0.0 ./utr --artifacts_path=TestProjects/LightMapper/test-results --platform=StandaloneLinux64 --player-connection-ip=auto --player-load-path=players --suite=playmode --timeout=1200 --zero-tests-are-ok=1 + - command: DISPLAY=:0.0 ./utr --artifacts_path=TestProjects/Lightmapping/test-results --platform=StandaloneLinux64 --player-connection-ip=auto --player-load-path=players --suite=playmode --timeout=1200 --zero-tests-are-ok=1 after: - command: pip3 install ant_instability_detection --index-url https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade || exit 0 - command: find_instabilities || exit 0 @@ -182,14 +182,14 @@ LightMapper_Linux_Vulkan_Standalone_mono_Linear_CUSTOM-REVISION: logs: paths: - "**/test-results/**" - - "TestProjects/LightMapper/Logs/*.log" + - "TestProjects/Lightmapping/Logs/*.log" dependencies: - path: .yamato/_editor_priming.yml#editor:priming:CUSTOM-REVISION:Linux rerun: on_new_revision - - path: .yamato/lightmapper-linux-vulkan.yml#Build_LightMapper_Linux_Vulkan_Standalone_mono_Linear_CUSTOM-REVISION + - path: .yamato/lightmapping-linux-vulkan.yml#Build_Lightmapping_Linux_Vulkan_Standalone_mono_Linear_CUSTOM-REVISION rerun: on_new_revision -Build_LightMapper_Linux_Vulkan_Standalone_mono_Linear_CUSTOM-REVISION: - name: Build LightMapper on Linux_Vulkan_mono_Linear_Standalone_build_Player on version CUSTOM-REVISION +Build_Lightmapping_Linux_Vulkan_Standalone_mono_Linear_CUSTOM-REVISION: + name: Build Lightmapping on Linux_Vulkan_mono_Linear_Standalone_build_Player on version CUSTOM-REVISION agent: type: Unity::VM::GPU image: package-ci/ubuntu:stable @@ -214,7 +214,7 @@ Build_LightMapper_Linux_Vulkan_Standalone_mono_Linear_CUSTOM-REVISION: - command: sudo unity-downloader-cli --source-file unity_revision.txt -c editor -c il2cpp --wait --published-only retries: 2 - command: sudo apt-get install -y ocl-icd-opencl-dev - - command: DISPLAY=:0.0 ./utr $CACHE_ARGS --artifacts_path=TestProjects/LightMapper/test-results --build-only --editor-location=.Editor --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=StandaloneLinux64 --player-save-path=players --scripting-backend=Mono2x --suite=playmode --testfilter=$TEST_FILTER --testproject=./TestProjects/LightMapper --timeout=1200 + - command: DISPLAY=:0.0 ./utr $CACHE_ARGS --artifacts_path=TestProjects/Lightmapping/test-results --build-only --editor-location=.Editor --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=StandaloneLinux64 --player-save-path=players --scripting-backend=Mono2x --suite=playmode --testfilter=$TEST_FILTER --testproject=./TestProjects/Lightmapping --timeout=1200 after: - command: pip3 install ant_instability_detection --index-url https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade || exit 0 - command: find_instabilities || exit 0 @@ -222,7 +222,7 @@ Build_LightMapper_Linux_Vulkan_Standalone_mono_Linear_CUSTOM-REVISION: logs: paths: - "**/test-results/**" - - "TestProjects/LightMapper/Logs/*.log" + - "TestProjects/Lightmapping/Logs/*.log" players: paths: - "players*/**" diff --git a/.yamato/lightmapper-osx-metal.yml b/.yamato/lightmapping-osx-metal.yml similarity index 78% rename from .yamato/lightmapper-osx-metal.yml rename to .yamato/lightmapping-osx-metal.yml index c9df5884288..5c5916557ca 100644 --- a/.yamato/lightmapper-osx-metal.yml +++ b/.yamato/lightmapping-osx-metal.yml @@ -7,8 +7,8 @@ --- -LightMapper_OSX_Metal_editmode_mono_Linear_trunk: - name: LightMapper on OSX_Metal_editmode_mono_Linear on version trunk +Lightmapping_OSX_Metal_editmode_mono_Linear_trunk: + name: Lightmapping on OSX_Metal_editmode_mono_Linear on version trunk agent: type: Unity::metal::macmini image: slough-ops/macos-10.14-xcode:stable @@ -32,9 +32,9 @@ LightMapper_OSX_Metal_editmode_mono_Linear_trunk: - command: ssh -i ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP '$(python3 -m site --user-base)/bin/unity-downloader-cli --source-file ~/Graphics/unity_revision.txt -c editor -c il2cpp --wait --published-only' retries: 2 - command: |5- - ssh -i ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP "export UPM_REGISTRY=https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates; ~/Graphics/utr --artifacts_path=/Users/bokken/Graphics/TestProjects/LightMapper/test-results --editor-location=/Users/bokken/.Editor --extra-editor-arg="-colorspace=Linear" --platform=editmode --scripting-backend=Mono2x --suite=editor --testfilter=$TEST_FILTER --testproject=/Users/bokken/Graphics/TestProjects/LightMapper --zero-tests-are-ok=1 " + ssh -i ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP "export UPM_REGISTRY=https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates; ~/Graphics/utr --artifacts_path=/Users/bokken/Graphics/TestProjects/Lightmapping/test-results --editor-location=/Users/bokken/.Editor --extra-editor-arg="-colorspace=Linear" --platform=editmode --scripting-backend=Mono2x --suite=editor --testfilter=$TEST_FILTER --testproject=/Users/bokken/Graphics/TestProjects/Lightmapping --zero-tests-are-ok=1 " UTR_RESULT=$? - scp -i ~/.ssh/id_rsa_macmini -r bokken@$BOKKEN_DEVICE_IP:/Users/bokken/Graphics/TestProjects/LightMapper/test-results/ TestProjects/LightMapper + scp -i ~/.ssh/id_rsa_macmini -r bokken@$BOKKEN_DEVICE_IP:/Users/bokken/Graphics/TestProjects/Lightmapping/test-results/ TestProjects/Lightmapping exit $UTR_RESULT after: - command: pip3 install requests ant_instability_detection --index-url https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade || exit 0 @@ -43,12 +43,12 @@ LightMapper_OSX_Metal_editmode_mono_Linear_trunk: logs: paths: - "**/test-results/**" - - "TestProjects/LightMapper/Logs/*.log" + - "TestProjects/Lightmapping/Logs/*.log" dependencies: - path: .yamato/_editor_priming.yml#editor:priming:trunk:OSX rerun: on_new_revision -LightMapper_OSX_Metal_Standalone_mono_Linear_trunk: - name: LightMapper on OSX_Metal_Standalone_mono_Linear on version trunk +Lightmapping_OSX_Metal_Standalone_mono_Linear_trunk: + name: Lightmapping on OSX_Metal_Standalone_mono_Linear on version trunk agent: type: Unity::metal::macmini image: slough-ops/macos-10.14-xcode:stable @@ -72,9 +72,9 @@ LightMapper_OSX_Metal_Standalone_mono_Linear_trunk: - command: ssh -i ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP '$(python3 -m site --user-base)/bin/unity-downloader-cli --source-file ~/Graphics/unity_revision.txt -c editor -c il2cpp --wait --published-only' retries: 2 - command: |5- - ssh -i ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP "export UPM_REGISTRY=https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates; ~/Graphics/utr $CACHE_ARGS --artifacts_path=/Users/bokken/Graphics/TestProjects/LightMapper/test-results --editor-location=.Editor --platform=StandaloneOSX --scripting-backend=Mono2x --suite=playmode --testfilter=$TEST_FILTER --testproject=/Users/bokken/Graphics/TestProjects/LightMapper --timeout=1200 --zero-tests-are-ok=1 " + ssh -i ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP "export UPM_REGISTRY=https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates; ~/Graphics/utr $CACHE_ARGS --artifacts_path=/Users/bokken/Graphics/TestProjects/Lightmapping/test-results --editor-location=.Editor --platform=StandaloneOSX --scripting-backend=Mono2x --suite=playmode --testfilter=$TEST_FILTER --testproject=/Users/bokken/Graphics/TestProjects/Lightmapping --timeout=1200 --zero-tests-are-ok=1 " UTR_RESULT=$? - scp -i ~/.ssh/id_rsa_macmini -r bokken@$BOKKEN_DEVICE_IP:/Users/bokken/Graphics/TestProjects/LightMapper/test-results/ TestProjects/LightMapper + scp -i ~/.ssh/id_rsa_macmini -r bokken@$BOKKEN_DEVICE_IP:/Users/bokken/Graphics/TestProjects/Lightmapping/test-results/ TestProjects/Lightmapping exit $UTR_RESULT after: - command: pip3 install requests ant_instability_detection --index-url https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade || exit 0 @@ -83,12 +83,12 @@ LightMapper_OSX_Metal_Standalone_mono_Linear_trunk: logs: paths: - "**/test-results/**" - - "TestProjects/LightMapper/Logs/*.log" + - "TestProjects/Lightmapping/Logs/*.log" dependencies: - path: .yamato/_editor_priming.yml#editor:priming:trunk:OSX rerun: on_new_revision -LightMapper_OSX_Metal_editmode_mono_Linear_CUSTOM-REVISION: - name: LightMapper on OSX_Metal_editmode_mono_Linear on version CUSTOM-REVISION +Lightmapping_OSX_Metal_editmode_mono_Linear_CUSTOM-REVISION: + name: Lightmapping on OSX_Metal_editmode_mono_Linear on version CUSTOM-REVISION agent: type: Unity::metal::macmini image: slough-ops/macos-10.14-xcode:stable @@ -112,9 +112,9 @@ LightMapper_OSX_Metal_editmode_mono_Linear_CUSTOM-REVISION: - command: ssh -i ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP '$(python3 -m site --user-base)/bin/unity-downloader-cli --source-file ~/Graphics/unity_revision.txt -c editor -c il2cpp --wait --published-only' retries: 2 - command: |5- - ssh -i ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP "export UPM_REGISTRY=https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates; ~/Graphics/utr --artifacts_path=/Users/bokken/Graphics/TestProjects/LightMapper/test-results --editor-location=/Users/bokken/.Editor --extra-editor-arg="-colorspace=Linear" --platform=editmode --scripting-backend=Mono2x --suite=editor --testfilter=$TEST_FILTER --testproject=/Users/bokken/Graphics/TestProjects/LightMapper --zero-tests-are-ok=1 " + ssh -i ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP "export UPM_REGISTRY=https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates; ~/Graphics/utr --artifacts_path=/Users/bokken/Graphics/TestProjects/Lightmapping/test-results --editor-location=/Users/bokken/.Editor --extra-editor-arg="-colorspace=Linear" --platform=editmode --scripting-backend=Mono2x --suite=editor --testfilter=$TEST_FILTER --testproject=/Users/bokken/Graphics/TestProjects/Lightmapping --zero-tests-are-ok=1 " UTR_RESULT=$? - scp -i ~/.ssh/id_rsa_macmini -r bokken@$BOKKEN_DEVICE_IP:/Users/bokken/Graphics/TestProjects/LightMapper/test-results/ TestProjects/LightMapper + scp -i ~/.ssh/id_rsa_macmini -r bokken@$BOKKEN_DEVICE_IP:/Users/bokken/Graphics/TestProjects/Lightmapping/test-results/ TestProjects/Lightmapping exit $UTR_RESULT after: - command: pip3 install requests ant_instability_detection --index-url https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade || exit 0 @@ -123,12 +123,12 @@ LightMapper_OSX_Metal_editmode_mono_Linear_CUSTOM-REVISION: logs: paths: - "**/test-results/**" - - "TestProjects/LightMapper/Logs/*.log" + - "TestProjects/Lightmapping/Logs/*.log" dependencies: - path: .yamato/_editor_priming.yml#editor:priming:CUSTOM-REVISION:OSX rerun: on_new_revision -LightMapper_OSX_Metal_Standalone_mono_Linear_CUSTOM-REVISION: - name: LightMapper on OSX_Metal_Standalone_mono_Linear on version CUSTOM-REVISION +Lightmapping_OSX_Metal_Standalone_mono_Linear_CUSTOM-REVISION: + name: Lightmapping on OSX_Metal_Standalone_mono_Linear on version CUSTOM-REVISION agent: type: Unity::metal::macmini image: slough-ops/macos-10.14-xcode:stable @@ -152,9 +152,9 @@ LightMapper_OSX_Metal_Standalone_mono_Linear_CUSTOM-REVISION: - command: ssh -i ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP '$(python3 -m site --user-base)/bin/unity-downloader-cli --source-file ~/Graphics/unity_revision.txt -c editor -c il2cpp --wait --published-only' retries: 2 - command: |5- - ssh -i ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP "export UPM_REGISTRY=https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates; ~/Graphics/utr $CACHE_ARGS --artifacts_path=/Users/bokken/Graphics/TestProjects/LightMapper/test-results --editor-location=.Editor --platform=StandaloneOSX --scripting-backend=Mono2x --suite=playmode --testfilter=$TEST_FILTER --testproject=/Users/bokken/Graphics/TestProjects/LightMapper --timeout=1200 --zero-tests-are-ok=1 " + ssh -i ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP "export UPM_REGISTRY=https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates; ~/Graphics/utr $CACHE_ARGS --artifacts_path=/Users/bokken/Graphics/TestProjects/Lightmapping/test-results --editor-location=.Editor --platform=StandaloneOSX --scripting-backend=Mono2x --suite=playmode --testfilter=$TEST_FILTER --testproject=/Users/bokken/Graphics/TestProjects/Lightmapping --timeout=1200 --zero-tests-are-ok=1 " UTR_RESULT=$? - scp -i ~/.ssh/id_rsa_macmini -r bokken@$BOKKEN_DEVICE_IP:/Users/bokken/Graphics/TestProjects/LightMapper/test-results/ TestProjects/LightMapper + scp -i ~/.ssh/id_rsa_macmini -r bokken@$BOKKEN_DEVICE_IP:/Users/bokken/Graphics/TestProjects/Lightmapping/test-results/ TestProjects/Lightmapping exit $UTR_RESULT after: - command: pip3 install requests ant_instability_detection --index-url https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade || exit 0 @@ -163,7 +163,7 @@ LightMapper_OSX_Metal_Standalone_mono_Linear_CUSTOM-REVISION: logs: paths: - "**/test-results/**" - - "TestProjects/LightMapper/Logs/*.log" + - "TestProjects/Lightmapping/Logs/*.log" dependencies: - path: .yamato/_editor_priming.yml#editor:priming:CUSTOM-REVISION:OSX rerun: on_new_revision diff --git a/.yamato/lightmapper-win-dx11.yml b/.yamato/lightmapping-win-dx11.yml similarity index 69% rename from .yamato/lightmapper-win-dx11.yml rename to .yamato/lightmapping-win-dx11.yml index 153799bce8b..1aa7d64495f 100644 --- a/.yamato/lightmapper-win-dx11.yml +++ b/.yamato/lightmapping-win-dx11.yml @@ -7,8 +7,8 @@ --- -LightMapper_Win_DX11_editmode_mono_Linear_trunk: - name: LightMapper on Win_DX11_editmode_mono_Linear on version trunk +Lightmapping_Win_DX11_editmode_mono_Linear_trunk: + name: Lightmapping on Win_DX11_editmode_mono_Linear on version trunk agent: type: Unity::VM::GPU image: graphics-foundation/win10-dxr:stable @@ -33,17 +33,17 @@ LightMapper_Win_DX11_editmode_mono_Linear_trunk: set /p GIT_REVISIONDATE=