Skip to content

[10.x.x][backport] Multiple yml backports #2517

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 8 commits into from
Nov 6, 2020
Merged

[10.x.x][backport] Multiple yml backports #2517

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
20b108f
[Yamato] Redo metafiles with utr flags (#2193)
Nov 4, 2020
1e62ae0
[yamato] Let jobs use revisions straight from the metafile (#2511)
Nov 4, 2020
714e249
replace all 2020.2 with 2020_2 in ymls
Nov 4, 2020
e860815
Revert manual underscore changes for versions
Nov 4, 2020
c72010d
[Performance] New performance jobs (#2455)
sophiaaar Nov 4, 2020
6f9f1e1
[Yamato] Fix cmd line args for graphics API (#2437)
sophiaaar Nov 5, 2020
054e90b
backport 2540
Nov 5, 2020
a2b47e6
add rest of python changes from clean master copy
Nov 5, 2020
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
70 changes: 37 additions & 33 deletions .yamato/_abv.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,10 @@
# Introduce any changes under .yamato/config/*.metafile files (for most cases) or under .yamato/ruamel/* within Python (more elaborate cases), and rerun build.py to regenerate all .yml files.
# Read more under .yamato/docs/readme.md

{% metadata_file .yamato/_latest_editor_versions_2020.2.metafile -%}

---

all_project_ci_2020.2:
name: _ABV for SRP repository - 2020.2
dependencies:
Expand All @@ -23,35 +27,35 @@ all_project_ci_nightly_2020.2:
dependencies:
- path: .yamato/_abv.yml#all_project_ci_2020.2
rerun: on-new-revision
- path: .yamato/smoke_test-win-dx11.yml#Smoke_Test_Win_DX11_playmode_mono_apiNet2_Linear_2020.2
- path: .yamato/smoke_test-win-dx11.yml#Smoke_Test_Win_DX11_playmode_mono_Linear_2020.2
rerun: on-new-revision
- path: .yamato/smoke_test-win-dx11.yml#Smoke_Test_Win_DX11_editmode_mono_apiNet2_Linear_2020.2
- path: .yamato/smoke_test-win-dx11.yml#Smoke_Test_Win_DX11_editmode_mono_Linear_2020.2
rerun: on-new-revision
- path: .yamato/smoke_test-win-dx11.yml#Smoke_Test_Win_DX11_Standalone_mono_apiNet2_Linear_2020.2
- path: .yamato/smoke_test-win-dx11.yml#Smoke_Test_Win_DX11_Standalone_mono_Linear_2020.2
rerun: on-new-revision
- path: .yamato/universal-android-opengles3.yml#Universal_Android_OpenGLES3_Standalone_il2cpp_apiNet4_Linear_2020.2
- path: .yamato/universal-android-opengles3.yml#Universal_Android_OpenGLES3_Standalone_il2cpp_Linear_2020.2
rerun: on-new-revision
- path: .yamato/universal-android-vulkan.yml#Universal_Android_Vulkan_Standalone_il2cpp_apiNet4_Linear_2020.2
- path: .yamato/universal-android-vulkan.yml#Universal_Android_Vulkan_Standalone_il2cpp_Linear_2020.2
rerun: on-new-revision
- path: .yamato/universal-iphone-metal.yml#Universal_iPhone_Metal_Standalone_mono_apiNet2_Linear_2020.2
- path: .yamato/universal-iphone-metal.yml#Universal_iPhone_Metal_Standalone_il2cpp_Linear_2020.2
rerun: on-new-revision
- path: .yamato/universal-win-vulkan.yml#Universal_Win_Vulkan_playmode_mono_apiNet2_Linear_2020.2
- path: .yamato/universal-win-vulkan.yml#Universal_Win_Vulkan_playmode_mono_Linear_2020.2
rerun: on-new-revision
- path: .yamato/universal-win-vulkan.yml#Universal_Win_Vulkan_playmode_XR_mono_apiNet2_Linear_2020.2
- path: .yamato/universal-win-vulkan.yml#Universal_Win_Vulkan_playmode_XR_mono_Linear_2020.2
rerun: on-new-revision
- path: .yamato/universal-win-dx12.yml#Universal_Win_DX12_Standalone_mono_apiNet2_Linear_2020.2
- path: .yamato/universal-win-dx12.yml#Universal_Win_DX12_Standalone_mono_Linear_2020.2
rerun: on-new-revision
- path: .yamato/universal-win-dx12.yml#Universal_Win_DX12_editmode_mono_apiNet2_Linear_2020.2
- path: .yamato/universal-win-dx12.yml#Universal_Win_DX12_editmode_mono_Linear_2020.2
rerun: on-new-revision
- path: .yamato/universal-win-dx12.yml#Universal_Win_DX12_playmode_mono_apiNet2_Linear_2020.2
- path: .yamato/universal-win-dx12.yml#Universal_Win_DX12_playmode_mono_Linear_2020.2
rerun: on-new-revision
- path: .yamato/urpupdate-win-dx11.yml#URPUpdate_Win_DX11_editmode_mono_apiNet2_Linear_2020.2
- path: .yamato/urpupdate-win-dx11.yml#URPUpdate_Win_DX11_editmode_mono_Linear_2020.2
rerun: on-new-revision
- path: .yamato/urpupdate-win-dx11.yml#URPUpdate_Win_DX11_playmode_mono_apiNet2_Linear_2020.2
- path: .yamato/urpupdate-win-dx11.yml#URPUpdate_Win_DX11_playmode_mono_Linear_2020.2
rerun: on-new-revision
- path: .yamato/urpupdate_top_asset_store-win-dx11.yml#URPUpdate_Top_Asset_Store_Win_DX11_editmode_mono_apiNet2_Linear_2020.2
- path: .yamato/urpupdate_top_asset_store-win-dx11.yml#URPUpdate_Top_Asset_Store_Win_DX11_editmode_mono_Linear_2020.2
rerun: on-new-revision
- path: .yamato/urpupdate_top_asset_store-win-dx11.yml#URPUpdate_Top_Asset_Store_Win_DX11_playmode_mono_apiNet2_Linear_2020.2
- path: .yamato/urpupdate_top_asset_store-win-dx11.yml#URPUpdate_Top_Asset_Store_Win_DX11_playmode_mono_Linear_2020.2
rerun: on-new-revision
- path: .yamato/all-urp_performance_boatattack.yml#All_URP_Performance_BoatAttack_2020.2
rerun: on-new-revision
Expand All @@ -62,23 +66,23 @@ all_project_ci_nightly_2020.2:
trunk_verification_2020.2:
name: Trunk verification - 2020.2
dependencies:
- path: .yamato/universal-win-dx11.yml#Universal_Win_DX11_playmode_mono_apiNet2_Linear_2020.2
- path: .yamato/universal-win-dx11.yml#Universal_Win_DX11_playmode_mono_Linear_2020.2
rerun: on-new-revision
- path: .yamato/universal-win-dx11.yml#Universal_Win_DX11_editmode_mono_apiNet2_Linear_2020.2
- path: .yamato/universal-win-dx11.yml#Universal_Win_DX11_editmode_mono_Linear_2020.2
rerun: on-new-revision
- path: .yamato/shadergraph-win-dx11.yml#ShaderGraph_Win_DX11_playmode_mono_apiNet2_Linear_2020.2
- path: .yamato/shadergraph-win-dx11.yml#ShaderGraph_Win_DX11_playmode_mono_Linear_2020.2
rerun: on-new-revision
- path: .yamato/shadergraph-win-dx11.yml#ShaderGraph_Win_DX11_editmode_mono_apiNet2_Linear_2020.2
- path: .yamato/shadergraph-win-dx11.yml#ShaderGraph_Win_DX11_editmode_mono_Linear_2020.2
rerun: on-new-revision
- path: .yamato/hdrp-win-dx11.yml#HDRP_Win_DX11_playmode_mono_apiNet2_Linear_2020.2
- path: .yamato/hdrp-win-dx11.yml#HDRP_Win_DX11_playmode_mono_Linear_2020.2
rerun: on-new-revision
- path: .yamato/hdrp-win-dx11.yml#HDRP_Win_DX11_editmode_mono_apiNet2_Linear_2020.2
- path: .yamato/hdrp-win-dx11.yml#HDRP_Win_DX11_editmode_mono_Linear_2020.2
rerun: on-new-revision
- path: .yamato/vfx_hdrp-win-dx11.yml#VFX_HDRP_Win_DX11_playmode_mono_apiNet2_Linear_2020.2
- path: .yamato/vfx_hdrp-win-dx11.yml#VFX_HDRP_Win_DX11_playmode_mono_Linear_2020.2
rerun: on-new-revision
- path: .yamato/vfx_hdrp-win-dx11.yml#VFX_HDRP_Win_DX11_editmode_mono_apiNet2_Linear_2020.2
- path: .yamato/vfx_hdrp-win-dx11.yml#VFX_HDRP_Win_DX11_editmode_mono_Linear_2020.2
rerun: on-new-revision
- path: .yamato/vfx_urp-win-dx11.yml#VFX_URP_Win_DX11_playmode_mono_apiNet2_Linear_2020.2
- path: .yamato/vfx_urp-win-dx11.yml#VFX_URP_Win_DX11_playmode_mono_Linear_2020.2
rerun: on-new-revision
all_project_ci_CUSTOM-REVISION:
name: _ABV for SRP repository - CUSTOM-REVISION
Expand All @@ -100,23 +104,23 @@ all_project_ci_CUSTOM-REVISION:
trunk_verification_CUSTOM-REVISION:
name: Trunk verification - CUSTOM-REVISION
dependencies:
- path: .yamato/universal-win-dx11.yml#Universal_Win_DX11_playmode_mono_apiNet2_Linear_CUSTOM-REVISION
- path: .yamato/universal-win-dx11.yml#Universal_Win_DX11_playmode_mono_Linear_CUSTOM-REVISION
rerun: always
- path: .yamato/universal-win-dx11.yml#Universal_Win_DX11_editmode_mono_apiNet2_Linear_CUSTOM-REVISION
- path: .yamato/universal-win-dx11.yml#Universal_Win_DX11_editmode_mono_Linear_CUSTOM-REVISION
rerun: always
- path: .yamato/shadergraph-win-dx11.yml#ShaderGraph_Win_DX11_playmode_mono_apiNet2_Linear_CUSTOM-REVISION
- path: .yamato/shadergraph-win-dx11.yml#ShaderGraph_Win_DX11_playmode_mono_Linear_CUSTOM-REVISION
rerun: always
- path: .yamato/shadergraph-win-dx11.yml#ShaderGraph_Win_DX11_editmode_mono_apiNet2_Linear_CUSTOM-REVISION
- path: .yamato/shadergraph-win-dx11.yml#ShaderGraph_Win_DX11_editmode_mono_Linear_CUSTOM-REVISION
rerun: always
- path: .yamato/hdrp-win-dx11.yml#HDRP_Win_DX11_playmode_mono_apiNet2_Linear_CUSTOM-REVISION
- path: .yamato/hdrp-win-dx11.yml#HDRP_Win_DX11_playmode_mono_Linear_CUSTOM-REVISION
rerun: always
- path: .yamato/hdrp-win-dx11.yml#HDRP_Win_DX11_editmode_mono_apiNet2_Linear_CUSTOM-REVISION
- path: .yamato/hdrp-win-dx11.yml#HDRP_Win_DX11_editmode_mono_Linear_CUSTOM-REVISION
rerun: always
- path: .yamato/vfx_hdrp-win-dx11.yml#VFX_HDRP_Win_DX11_playmode_mono_apiNet2_Linear_CUSTOM-REVISION
- path: .yamato/vfx_hdrp-win-dx11.yml#VFX_HDRP_Win_DX11_playmode_mono_Linear_CUSTOM-REVISION
rerun: always
- path: .yamato/vfx_hdrp-win-dx11.yml#VFX_HDRP_Win_DX11_editmode_mono_apiNet2_Linear_CUSTOM-REVISION
- path: .yamato/vfx_hdrp-win-dx11.yml#VFX_HDRP_Win_DX11_editmode_mono_Linear_CUSTOM-REVISION
rerun: always
- path: .yamato/vfx_urp-win-dx11.yml#VFX_URP_Win_DX11_playmode_mono_apiNet2_Linear_CUSTOM-REVISION
- path: .yamato/vfx_urp-win-dx11.yml#VFX_URP_Win_DX11_playmode_mono_Linear_CUSTOM-REVISION
rerun: always
variables:
CUSTOM_REVISION: custom_revision_not_set
52 changes: 4 additions & 48 deletions .yamato/_editor_pinning.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,10 @@
# Introduce any changes under .yamato/config/*.metafile files (for most cases) or under .yamato/ruamel/* within Python (more elaborate cases), and rerun build.py to regenerate all .yml files.
# Read more under .yamato/docs/readme.md

{% metadata_file .yamato/_latest_editor_versions_2020.2.metafile -%}

---

editor-pinning-target-to-ci:
name: Merge 10.x.x/release to 10.x.x/ci/editor-pinning
agent:
Expand Down Expand Up @@ -109,63 +113,15 @@ editor-pinning-merge-revisions-2020.2-abv:
- pipenv run python3 .yamato/ruamel/editor_pinning/merge_revisions.py --revision $GIT_REVISION --target-branch 10.x.x/release --track 2020.2
editor-pinning-merge-all:
name: Merge all [no ABV] [no CI]
agent:
type: Unity::VM
image: package-ci/ubuntu:stable
flavor: b1.small
variables:
CI: true
dependencies:
- .yamato/_editor_pinning.yml#editor-pinning-merge-revisions-2020.2
commands:
- sudo pip3 install pipenv --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple
- python3 -m pipenv install --dev
- curl -L https://artifactory.prd.it.unity3d.com/artifactory/api/gpg/key/public | sudo apt-key add -
- sudo sh -c "echo 'deb https://artifactory.prd.it.unity3d.com/artifactory/unity-apt-local bionic main' > /etc/apt/sources.list.d/unity.list"
- sudo apt-get update
- |5-

if [[ "$GIT_BRANCH" != "10.x.x/ci/editor-pinning" ]]; then
echo "Should run on '10.x.x/ci/editor-pinning' but is running on '$GIT_BRANCH'"
exit 1
fi
- git config --global user.name "noreply@unity3d.com"
- git config --global user.email "noreply@unity3d.com"
- git checkout 10.x.x/release
- git pull
- pipenv run python3 .yamato/ruamel/build.py
- git add .yamato/*.yml
- git commit -m "[CI] Updated .ymls to new revision" --allow-empty
- git push
editor-pinning-merge-all-abv:
name: Merge all [ABV] [CI]
triggers:
expression: push.branch eq "10.x.x/ci/editor-pinning" AND push.changes.any match "**/_latest_editor_versions*.metafile"
agent:
type: Unity::VM
image: package-ci/ubuntu:stable
flavor: b1.small
variables:
CI: true
dependencies:
- .yamato/_editor_pinning.yml#editor-pinning-merge-revisions-2020.2-abv
commands:
- sudo pip3 install pipenv --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple
- python3 -m pipenv install --dev
- curl -L https://artifactory.prd.it.unity3d.com/artifactory/api/gpg/key/public | sudo apt-key add -
- sudo sh -c "echo 'deb https://artifactory.prd.it.unity3d.com/artifactory/unity-apt-local bionic main' > /etc/apt/sources.list.d/unity.list"
- sudo apt-get update
- |5-

if [[ "$GIT_BRANCH" != "10.x.x/ci/editor-pinning" ]]; then
echo "Should run on '10.x.x/ci/editor-pinning' but is running on '$GIT_BRANCH'"
exit 1
fi
- git config --global user.name "noreply@unity3d.com"
- git config --global user.email "noreply@unity3d.com"
- git checkout 10.x.x/release
- git pull
- pipenv run python3 .yamato/ruamel/build.py
- git add .yamato/*.yml
- git commit -m "[CI] Updated .ymls to new revision" --allow-empty
- git push
4 changes: 4 additions & 0 deletions .yamato/_editor_priming.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,10 @@
# Introduce any changes under .yamato/config/*.metafile files (for most cases) or under .yamato/ruamel/* within Python (more elaborate cases), and rerun build.py to regenerate all .yml files.
# Read more under .yamato/docs/readme.md

{% metadata_file .yamato/_latest_editor_versions_2020.2.metafile -%}

---

editor:priming:CUSTOM-REVISION:macos:
name: '[CUSTOM-REVISION,macos] Editor priming'
agent:
Expand Down
12 changes: 6 additions & 6 deletions ...g/_latest_editor_versions_2020.2.metafile → ...o/_latest_editor_versions_2020.2.metafile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,12 @@
# To add new Unity Editor tracks, the script needs to be updated.

editor_version_names:
- 2020.2_latest_internal
- 2020.2_latest_public
- 2020.2_staging
- 2020_2_latest_internal
- 2020_2_latest_public
- 2020_2_staging

editor_versions:
2020.2_latest_internal:
2020_2_latest_internal:
android:
revision: 19f63eee530c
version: 2020.2.0b10
Expand All @@ -23,7 +23,7 @@ editor_versions:
windows:
revision: 19f63eee530c
version: 2020.2.0b10
2020.2_latest_public:
2020_2_latest_public:
android:
revision: ef2968fa77ae
version: 2020.2.0b9
Expand All @@ -39,7 +39,7 @@ editor_versions:
windows:
revision: ef2968fa77ae
version: 2020.2.0b9
2020.2_staging:
2020_2_staging:
android:
revision: 19f63eee530cf75bf6b9e470d2b27eedda41a780
version: ''
Expand Down
Loading