Skip to content

Commit

Permalink
ANT-602 - 2021.3/prep (#7344)
Browse files Browse the repository at this point in the history
* Prepare 2021.3

* Apply changes

* Update metafile name

* Fix metafile variable

* Fix forgotten bits

* ANT-605 Reenable part of the nightly (templates) (#7345)

* Reenable part of the nightly (templates)

* Fix 2021_2/3 variable
  • Loading branch information
Théo Penavaire authored Apr 7, 2022
1 parent 2533ac2 commit ad85b53
Show file tree
Hide file tree
Showing 199 changed files with 6,791 additions and 6,714 deletions.
18 changes: 9 additions & 9 deletions .github/pr-commenter.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,43 +16,43 @@ comment:
- TestProjects/HDRP*/**/*
body: |
**HDRP**
`/jobDefinition/.yamato%2Fall-hdrp.yml%23PR_HDRP_2021.2`
`/jobDefinition/.yamato%2Fall-hdrp.yml%23PR_HDRP_2021.3`
With changes to HDRP packages, you should also run
`/jobDefinition/.yamato%2Fall-lightmapping.yml%23PR_Lightmapping_2021.2`
`/jobDefinition/.yamato%2Fall-lightmapping.yml%23PR_Lightmapping_2021.3`
- id: URP
files:
- com.unity.render-pipelines.universal/**/*
- com.unity.testing.urp/**/*
- TestProjects/Universal*/**/*
body: |
**URP**
`/jobDefinition/.yamato%2Fall-urp.yml%23PR_URP_2021.2`
`/jobDefinition/.yamato%2Fall-urp.yml%23PR_URP_2021.3`
With changes to URP packages, you should also run
`/jobDefinition/.yamato%2Fall-lightmapping.yml%23PR_Lightmapping_2021.2`
`/jobDefinition/.yamato%2Fall-lightmapping.yml%23PR_Lightmapping_2021.3`
- id: ShaderGraph
files:
- com.unity.shadergraph/**/*
- TestProjects/ShaderGraph*/**/*
- com.unity.render-pipelines.universal/Editor/ShaderGraph/*
body: |
**Shader Graph**
`/jobDefinition/.yamato%252Fall-shadergraph.yml%2523PR_ShaderGraph_2021.2`
`/jobDefinition/.yamato%252Fall-shadergraph.yml%2523PR_ShaderGraph_2021.3`
Depending on your PR, you may also want
`/jobDefinition/.yamato%252Fall-shadergraph_builtin_foundation.yml%2523PR_ShaderGraph_BuiltIn_Foundation_2021.2`
/jobDefinition/.yamato%2Fall-shadergraph_builtin_lighting.yml%23PR_ShaderGraph_BuiltIn_Lighting_2021.2
`/jobDefinition/.yamato%252Fall-shadergraph_builtin_foundation.yml%2523PR_ShaderGraph_BuiltIn_Foundation_2021.3`
/jobDefinition/.yamato%2Fall-shadergraph_builtin_lighting.yml%23PR_ShaderGraph_BuiltIn_Lighting_2021.3
- id: VFX
files:
- com.unity.visualeffectgraph/**/*
- com.unity.testing.visualeffectgraph/**/*
- TestProjects/VisualEffectGraph*/**/*
body: |
**VFX**
`/jobDefinition/.yamato%252Fall-vfx.yml%2523PR_VFX_2021.2`
`/jobDefinition/.yamato%252Fall-vfx.yml%2523PR_VFX_2021.3`
- id: Core
files:
- com.unity.render-pipelines.core/**/*
body: |
**SRP Core**
You could run ABV on your branch before merging your PR, but it will start A LOT of jobs. Please be responsible about it and run it only when you feel the PR is ready:
`/jobDefinition/.yamato%2F_abv.yml%23all_project_ci_2021.2`
`/jobDefinition/.yamato%2F_abv.yml%23all_project_ci_2021.3`
Be aware that any modifications to the Core package impacts everyone in the Graphics repo so please discuss the PR with your lead.
164 changes: 95 additions & 69 deletions .yamato/_abv.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,127 +3,143 @@
# Introduce any changes under .yamato/config/*.metafile files and rerun yaml-generation (or check #devs-automation-tooling).

{% metadata_file .yamato/_cache_config.metafile -%}
{% metadata_file .yamato/_latest_editor_versions_2021.2.metafile -%}
{% metadata_file .yamato/_latest_editor_versions_2021.3.metafile -%}

---

all_project_ci_2021.2:
name: ABV (all PR jobs) on 2021.2
all_project_ci_2021.3:
name: ABV (all PR jobs) on 2021.3
variables:
CUSTOM_REVISION: '{{2021_2.changeset.id}}'
UTR_VERSION: "current"
TEST_FILTER: .*
CACHE_ARGS: '{{cache.flags}}'
CUSTOM_REVISION: '{{2021_3.changeset.id}}'
TEST_FILTER: .*
UTR_VERSION: "current"
dependencies:
- path: .yamato/all-hdrp.yml#PR_HDRP_2021.2
- path: .yamato/all-hdrp.yml#PR_HDRP_2021.3
rerun: on_new_revision
- path: .yamato/all-vfx.yml#PR_VFX_2021.2
- path: .yamato/all-vfx.yml#PR_VFX_2021.3
rerun: on_new_revision
- path: .yamato/all-urp.yml#PR_URP_2021.2
- path: .yamato/all-urp.yml#PR_URP_2021.3
rerun: on_new_revision
- path: .yamato/all-shadergraph.yml#PR_ShaderGraph_2021.2
- path: .yamato/all-shadergraph.yml#PR_ShaderGraph_2021.3
rerun: on_new_revision
- path: .yamato/_abv.yml#General_Checks_2021.2
- path: .yamato/_abv.yml#General_Checks_2021.3
rerun: on_new_revision
all_project_ci_nightly_2021.2:
name: Nightly on 2021.2
graphics_repo_nightly_2021.3:
name: Graphics repo nightly on 2021.3
variables:
CUSTOM_REVISION: '{{2021_2.changeset.id}}'
UTR_VERSION: "current"
CACHE_ARGS: '{{cache.flags}}'
CUSTOM_REVISION: '{{2021_3.changeset.id}}'
TEST_FILTER: .*
UTR_VERSION: "current"
triggers:
recurring:
- branch: 2021.3/staging
frequency: 1 * * ?


dependencies:
- path: .yamato/_templates.yml#all_template_ci_2021.3
rerun: on_new_revision
all_project_ci_nightly_2021.3:
name: Nightly on 2021.3
variables:
CACHE_ARGS: '{{cache.flags}}'
CUSTOM_REVISION: '{{2021_3.changeset.id}}'
TEST_FILTER: .*
UTR_VERSION: "current"
dependencies:
- path: .yamato/all-hdrp.yml#Nightly_HDRP_2021.2
- path: .yamato/all-hdrp.yml#Nightly_HDRP_2021.3
rerun: on_new_revision
- path: .yamato/all-vfx.yml#Nightly_VFX_2021.2
- path: .yamato/all-vfx.yml#Nightly_VFX_2021.3
rerun: on_new_revision
- path: .yamato/all-urp.yml#Nightly_URP_2021.2
- path: .yamato/all-urp.yml#Nightly_URP_2021.3
rerun: on_new_revision
- path: .yamato/all-shadergraph.yml#Nightly_ShaderGraph_2021.2
- path: .yamato/all-shadergraph.yml#Nightly_ShaderGraph_2021.3
rerun: on_new_revision
- path: .yamato/all-lightmapping.yml#Lightmapping_2021.2
- path: .yamato/all-lightmapping.yml#Lightmapping_2021.3
rerun: on_new_revision
- path: .yamato/_templates.yml#all_template_ci_2021.2
- path: .yamato/_templates.yml#all_template_ci_2021.3
rerun: on_new_revision
- path: .yamato/_abv.yml#General_Checks_2021.2
- path: .yamato/_abv.yml#General_Checks_2021.3
rerun: on_new_revision
General_Checks_2021.2:
name: General Checks on 2021.2
General_Checks_2021.3:
name: General Checks on 2021.3
variables:
CUSTOM_REVISION: '{{2021_2.changeset.id}}'
UTR_VERSION: "current"
TEST_FILTER: .*
CACHE_ARGS: '{{cache.flags}}'
CUSTOM_REVISION: '{{2021_3.changeset.id}}'
TEST_FILTER: .*
UTR_VERSION: "current"
dependencies:
- path: .yamato/_projectcontext.yml#all_package_ci_project_2021.2
- path: .yamato/_projectcontext.yml#all_package_ci_project_2021.3
rerun: on_new_revision
- path: .yamato/_formatting.yml#formatting
rerun: on_new_revision
- path: .yamato/all-smoke_test.yml#Smoke_Test_2021.2
- path: .yamato/all-smoke_test.yml#Smoke_Test_2021.3
rerun: on_new_revision
Safety_net_2021.2:
name: Safety net on 2021.2
Safety_net_2021.3:
name: Safety net on 2021.3
variables:
CUSTOM_REVISION: '{{2021_2.changeset.id}}'
UTR_VERSION: "current"
TEST_FILTER: .*
CACHE_ARGS: '{{cache.flags}}'
CUSTOM_REVISION: '{{2021_3.changeset.id}}'
TEST_FILTER: .*
UTR_VERSION: "current"
dependencies:
- path: .yamato/shadergraph-win-dx11.yml#ShaderGraph_Win_DX11_playmode_mono_Linear_2021.2
- path: .yamato/shadergraph-win-dx11.yml#ShaderGraph_Win_DX11_playmode_mono_Linear_2021.3
rerun: on_new_revision
- path: .yamato/vfx_hdrp-win-dx11.yml#VFX_HDRP_Win_DX11_playmode_mono_Linear_2021.2
- path: .yamato/vfx_hdrp-win-dx11.yml#VFX_HDRP_Win_DX11_playmode_mono_Linear_2021.3
rerun: on_new_revision
- path: .yamato/vfx_urp-win-dx11.yml#VFX_URP_Win_DX11_playmode_mono_Linear_2021.2
- path: .yamato/vfx_urp-win-dx11.yml#VFX_URP_Win_DX11_playmode_mono_Linear_2021.3
rerun: on_new_revision
Trunk_verification_2021.2:
name: Trunk verification on 2021.2
Trunk_verification_2021.3:
name: Trunk verification on 2021.3
variables:
CUSTOM_REVISION: '{{2021_2.changeset.id}}'
UTR_VERSION: "current"
TEST_FILTER: .*
CACHE_ARGS: '{{cache.flags}}'
CUSTOM_REVISION: '{{2021_3.changeset.id}}'
TEST_FILTER: .*
UTR_VERSION: "current"
dependencies:
- path: .yamato/urp_2d-win-dx11.yml#URP_2D_Win_DX11_playmode_mono_Linear_2021.2
- path: .yamato/urp_2d-win-dx11.yml#URP_2D_Win_DX11_playmode_mono_Linear_2021.3
rerun: on_new_revision
- path: .yamato/urp_2d-win-dx11.yml#URP_2D_Win_DX11_editmode_mono_Linear_2021.2
- path: .yamato/urp_2d-win-dx11.yml#URP_2D_Win_DX11_editmode_mono_Linear_2021.3
rerun: on_new_revision
- path: .yamato/urp_foundation-win-dx11.yml#URP_Foundation_Win_DX11_playmode_mono_Linear_2021.2
- path: .yamato/urp_foundation-win-dx11.yml#URP_Foundation_Win_DX11_playmode_mono_Linear_2021.3
rerun: on_new_revision
- path: .yamato/urp_foundation-win-dx11.yml#URP_Foundation_Win_DX11_editmode_mono_Linear_2021.2
- path: .yamato/urp_foundation-win-dx11.yml#URP_Foundation_Win_DX11_editmode_mono_Linear_2021.3
rerun: on_new_revision
- path: .yamato/urp_lighting-win-dx11.yml#URP_Lighting_Win_DX11_playmode_mono_Linear_2021.2
- path: .yamato/urp_lighting-win-dx11.yml#URP_Lighting_Win_DX11_playmode_mono_Linear_2021.3
rerun: on_new_revision
- path: .yamato/urp_lighting-win-dx11.yml#URP_Lighting_Win_DX11_editmode_mono_Linear_2021.2
- path: .yamato/urp_lighting-win-dx11.yml#URP_Lighting_Win_DX11_editmode_mono_Linear_2021.3
rerun: on_new_revision
- path: .yamato/urp_postpro-win-dx11.yml#URP_PostPro_Win_DX11_playmode_mono_Linear_2021.2
- path: .yamato/urp_postpro-win-dx11.yml#URP_PostPro_Win_DX11_playmode_mono_Linear_2021.3
rerun: on_new_revision
- path: .yamato/urp_postpro-win-dx11.yml#URP_PostPro_Win_DX11_editmode_mono_Linear_2021.2
- path: .yamato/urp_postpro-win-dx11.yml#URP_PostPro_Win_DX11_editmode_mono_Linear_2021.3
rerun: on_new_revision
- path: .yamato/urp_terrain-win-dx11.yml#URP_Terrain_Win_DX11_playmode_mono_Linear_2021.2
- path: .yamato/urp_terrain-win-dx11.yml#URP_Terrain_Win_DX11_playmode_mono_Linear_2021.3
rerun: on_new_revision
- path: .yamato/urp_terrain-win-dx11.yml#URP_Terrain_Win_DX11_editmode_mono_Linear_2021.2
- path: .yamato/urp_terrain-win-dx11.yml#URP_Terrain_Win_DX11_editmode_mono_Linear_2021.3
rerun: on_new_revision
- path: .yamato/shadergraph-win-dx11.yml#ShaderGraph_Win_DX11_playmode_mono_Linear_2021.2
- path: .yamato/shadergraph-win-dx11.yml#ShaderGraph_Win_DX11_playmode_mono_Linear_2021.3
rerun: on_new_revision
- path: .yamato/shadergraph-win-dx11.yml#ShaderGraph_Win_DX11_editmode_mono_Linear_2021.2
- path: .yamato/shadergraph-win-dx11.yml#ShaderGraph_Win_DX11_editmode_mono_Linear_2021.3
rerun: on_new_revision
- path: .yamato/hdrp-win-dx11.yml#HDRP_Win_DX11_playmode_mono_Linear_2021.2
- path: .yamato/hdrp-win-dx11.yml#HDRP_Win_DX11_playmode_mono_Linear_2021.3
rerun: on_new_revision
- path: .yamato/hdrp-win-dx11.yml#HDRP_Win_DX11_editmode_mono_Linear_2021.2
- path: .yamato/hdrp-win-dx11.yml#HDRP_Win_DX11_editmode_mono_Linear_2021.3
rerun: on_new_revision
- path: .yamato/vfx_hdrp-win-dx11.yml#VFX_HDRP_Win_DX11_playmode_mono_Linear_2021.2
- path: .yamato/vfx_hdrp-win-dx11.yml#VFX_HDRP_Win_DX11_playmode_mono_Linear_2021.3
rerun: on_new_revision
- path: .yamato/vfx_hdrp-win-dx11.yml#VFX_HDRP_Win_DX11_editmode_mono_Linear_2021.2
- path: .yamato/vfx_hdrp-win-dx11.yml#VFX_HDRP_Win_DX11_editmode_mono_Linear_2021.3
rerun: on_new_revision
- path: .yamato/vfx_urp-win-dx11.yml#VFX_URP_Win_DX11_playmode_mono_Linear_2021.2
- path: .yamato/vfx_urp-win-dx11.yml#VFX_URP_Win_DX11_playmode_mono_Linear_2021.3
rerun: on_new_revision
all_project_ci_CUSTOM-REVISION:
name: ABV (all PR jobs) on CUSTOM-REVISION
variables:
CACHE_ARGS: '{{cache.flags}}'
CUSTOM_REVISION: custom_revision_not_set
UTR_VERSION: "current"
TEST_FILTER: .*
CACHE_ARGS: '{{cache.flags}}'
UTR_VERSION: "current"
dependencies:
- path: .yamato/all-hdrp.yml#PR_HDRP_CUSTOM-REVISION
rerun: on_new_revision
Expand All @@ -135,13 +151,23 @@ all_project_ci_CUSTOM-REVISION:
rerun: on_new_revision
- path: .yamato/_abv.yml#General_Checks_CUSTOM-REVISION
rerun: on_new_revision
graphics_repo_nightly_CUSTOM-REVISION:
name: Graphics repo nightly on CUSTOM-REVISION
variables:
CACHE_ARGS: '{{cache.flags}}'
CUSTOM_REVISION: custom_revision_not_set
TEST_FILTER: .*
UTR_VERSION: "current"
dependencies:
- path: .yamato/_templates.yml#all_template_ci_CUSTOM-REVISION
rerun: on_new_revision
all_project_ci_nightly_CUSTOM-REVISION:
name: Nightly on CUSTOM-REVISION
variables:
CACHE_ARGS: '{{cache.flags}}'
CUSTOM_REVISION: custom_revision_not_set
UTR_VERSION: "current"
TEST_FILTER: .*
CACHE_ARGS: '{{cache.flags}}'
UTR_VERSION: "current"
dependencies:
- path: .yamato/all-hdrp.yml#Nightly_HDRP_CUSTOM-REVISION
rerun: on_new_revision
Expand All @@ -160,10 +186,10 @@ all_project_ci_nightly_CUSTOM-REVISION:
General_Checks_CUSTOM-REVISION:
name: General Checks on CUSTOM-REVISION
variables:
CACHE_ARGS: '{{cache.flags}}'
CUSTOM_REVISION: custom_revision_not_set
UTR_VERSION: "current"
TEST_FILTER: .*
CACHE_ARGS: '{{cache.flags}}'
UTR_VERSION: "current"
dependencies:
- path: .yamato/_projectcontext.yml#all_package_ci_project_CUSTOM-REVISION
rerun: on_new_revision
Expand All @@ -174,10 +200,10 @@ General_Checks_CUSTOM-REVISION:
Safety_net_CUSTOM-REVISION:
name: Safety net on CUSTOM-REVISION
variables:
CACHE_ARGS: '{{cache.flags}}'
CUSTOM_REVISION: custom_revision_not_set
UTR_VERSION: "current"
TEST_FILTER: .*
CACHE_ARGS: '{{cache.flags}}'
UTR_VERSION: "current"
dependencies:
- path: .yamato/shadergraph-win-dx11.yml#ShaderGraph_Win_DX11_playmode_mono_Linear_CUSTOM-REVISION
rerun: on_new_revision
Expand All @@ -188,10 +214,10 @@ Safety_net_CUSTOM-REVISION:
Trunk_verification_CUSTOM-REVISION:
name: Trunk verification on CUSTOM-REVISION
variables:
CACHE_ARGS: '{{cache.flags}}'
CUSTOM_REVISION: custom_revision_not_set
UTR_VERSION: "current"
TEST_FILTER: .*
CACHE_ARGS: '{{cache.flags}}'
UTR_VERSION: "current"
dependencies:
- path: .yamato/urp_2d-win-dx11.yml#URP_2D_Win_DX11_playmode_mono_Linear_CUSTOM-REVISION
rerun: on_new_revision
Expand Down
2 changes: 1 addition & 1 deletion .yamato/_cache_config.metafile
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
cache:
flags: --extra-editor-arg="-cacheServerNamespacePrefix" --extra-editor-arg="SRP_2021.2" --extra-editor-arg="-adb2" --extra-editor-arg="-enableCacheServer" --extra-editor-arg="-cacheServerEndpoint" --extra-editor-arg="cacheserver-slo.hq.unity3d.com" --extra-editor-arg="-cacheServerEnableDownload" --extra-editor-arg="true" --extra-editor-arg="-cacheServerEnableUpload" --extra-editor-arg="true" --extra-editor-arg="-cacheServerWaitForUploadCompletion"
flags: --extra-editor-arg="-cacheServerNamespacePrefix" --extra-editor-arg="SRP_2021.3" --extra-editor-arg="-adb2" --extra-editor-arg="-enableCacheServer" --extra-editor-arg="-cacheServerEndpoint" --extra-editor-arg="cacheserver-slo.hq.unity3d.com" --extra-editor-arg="-cacheServerEnableDownload" --extra-editor-arg="true" --extra-editor-arg="-cacheServerEnableUpload" --extra-editor-arg="true" --extra-editor-arg="-cacheServerWaitForUploadCompletion"
33 changes: 33 additions & 0 deletions .yamato/_editor_pinning.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@

# This file is generated by ant_yaml_generation package, don't edit this file manually.
# Introduce any changes under .yamato/config/*.metafile files and rerun yaml-generation (or check #devs-automation-tooling).

{% metadata_file .yamato/_cache_config.metafile -%}
{% metadata_file .yamato/_latest_editor_versions_2021.3.metafile -%}

---

editor-pinning-update:
name: Update pinned editor versions
agent:
type: Unity::VM
image: package-ci/ubuntu:stable
flavor: b1.small
variables:
CI: true
commands:
- pip3 config set global.index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple
- pip3 install ruamel.yaml
- sudo rm -f /etc/apt/sources.list /etc/apt/sources.list.d/{nodesource,teamviewer,deadsnakes-ubuntu-ppa-}*
- 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 update
- sudo apt install unity-downloader-cli
- git config --global user.name "noreply@unity3d.com"
- git config --global user.email "noreply@unity3d.com"
- git checkout $GIT_BRANCH
- python3 .yamato/script/editor_scripts/update_revisions.py --track 2021.3 --ono-branch $ONO_BRANCH_2021_2 --api-key $ONO_API_KEY --commit-and-push --nr-commits-to-retrieve 1
triggers:
recurring:
- branch: 2021.3/staging
frequency: 21 * * ?
Loading

0 comments on commit ad85b53

Please sign in to comment.