Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/master' into sg/node-type-caching
Browse files Browse the repository at this point in the history
  • Loading branch information
elizabeth-legros committed Jul 2, 2020
2 parents 697160f + d0ebb10 commit d2081c2
Show file tree
Hide file tree
Showing 3,152 changed files with 226,335 additions and 51,048 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
1 change: 1 addition & 0 deletions .github/CODEOWNERS
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
# Test systems
/.yamato/ @Unity-Technologies/gfx-sdets
/katana-ci/ @Unity-Technologies/gfx-sdets
/git-hooks/ @Unity-Technologies/gfx-sdets
/com.unity.testframework.graphics/ @Unity-Technologies/gfx-sdets

# LWRP (Legacy)
Expand Down
52 changes: 18 additions & 34 deletions .yamato/_abv.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,10 @@ smoke_test_Standalone_trunk:
variables:
UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates
commands:
- git clone git@github.cds.internal.unity3d.com:unity/utr.git TestProjects/SRP_SmokeTest/utr
- curl -s https://artifactory.internal.unity3d.com/core-automation/tools/utr-standalone/utr.bat --output TestProjects/SRP_SmokeTest/utr.bat
- pip install unity-downloader-cli --extra-index-url https://artifactory.internal.unity3d.com/api/pypi/common-python/simple --upgrade
- cd TestProjects/SRP_SmokeTest && unity-downloader-cli --source-file ../../unity_revision.txt -c editor --wait --published-only
- cd TestProjects/SRP_SmokeTest && utr\utr --suite=playmode --platform=StandaloneWindows64 --testproject=. --editor-location=.Editor --artifacts_path=test-results --timeout=1200
- cd TestProjects/SRP_SmokeTest && utr --suite=playmode --platform=StandaloneWindows64 --testproject=. --editor-location=.Editor --artifacts_path=test-results --timeout=1200
dependencies:
- path: .yamato/_editor.yml#editor:priming:trunk:windows
rerun: on-new-revision
Expand All @@ -32,10 +32,10 @@ smoke_test_playmode_trunk:
variables:
UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates
commands:
- git clone git@github.cds.internal.unity3d.com:unity/utr.git TestProjects/SRP_SmokeTest/utr
- curl -s https://artifactory.internal.unity3d.com/core-automation/tools/utr-standalone/utr.bat --output TestProjects/SRP_SmokeTest/utr.bat
- pip install unity-downloader-cli --extra-index-url https://artifactory.internal.unity3d.com/api/pypi/common-python/simple --upgrade
- cd TestProjects/SRP_SmokeTest && unity-downloader-cli --source-file ../../unity_revision.txt -c editor --wait --published-only
- cd TestProjects/SRP_SmokeTest && utr\utr --suite=playmode --testproject=. --editor-location=.Editor --artifacts_path=test-results
- cd TestProjects/SRP_SmokeTest && utr --suite=playmode --testproject=. --editor-location=.Editor --artifacts_path=test-results
dependencies:
- path: .yamato/_editor.yml#editor:priming:trunk:windows
rerun: on-new-revision
Expand All @@ -52,10 +52,10 @@ smoke_test_editmode_trunk:
variables:
UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates
commands:
- git clone git@github.cds.internal.unity3d.com:unity/utr.git TestProjects/SRP_SmokeTest/utr
- curl -s https://artifactory.internal.unity3d.com/core-automation/tools/utr-standalone/utr.bat --output TestProjects/SRP_SmokeTest/utr.bat
- pip install unity-downloader-cli --extra-index-url https://artifactory.internal.unity3d.com/api/pypi/common-python/simple --upgrade
- cd TestProjects/SRP_SmokeTest && unity-downloader-cli --source-file ../../unity_revision.txt -c editor --wait --published-only
- cd TestProjects/SRP_SmokeTest && utr\utr --suite=editor --platform=editmode --testproject=. --editor-location=.Editor --artifacts_path=test-results
- cd TestProjects/SRP_SmokeTest && utr --suite=editor --platform=editmode --testproject=. --editor-location=.Editor --artifacts_path=test-results
dependencies:
- path: .yamato/_editor.yml#editor:priming:trunk:windows
rerun: on-new-revision
Expand All @@ -79,12 +79,8 @@ all_project_ci_trunk:
rerun: on-new-revision
- path: .yamato/all-universal.yml#All_Universal_trunk
rerun: on-new-revision
- path: .yamato/all-universal_stereo.yml#All_Universal_Stereo_trunk
rerun: on-new-revision
- path: .yamato/all-shadergraph.yml#All_ShaderGraph_trunk
rerun: on-new-revision
- path: .yamato/all-shadergraph_stereo.yml#All_ShaderGraph_Stereo_trunk
rerun: on-new-revision
- path: .yamato/all-hdrp.yml#All_HDRP_trunk
rerun: on-new-revision
- path: .yamato/all-vfx_hdrp.yml#All_VFX_HDRP_trunk
Expand All @@ -108,10 +104,6 @@ all_project_ci_nightly_trunk:
rerun: on-new-revision
- path: .yamato/universal-iphone-metal.yml#Universal_iPhone_Metal_Standalone_trunk
rerun: on-new-revision
- path: .yamato/all-hdrp_hybrid.yml#All_HDRP_Hybrid_trunk
rerun: on-new-revision
- path: .yamato/all-universal_hybrid.yml#All_Universal_Hybrid_trunk
rerun: on-new-revision
triggers:
recurring:
- branch: master
Expand Down Expand Up @@ -146,10 +138,10 @@ smoke_test_Standalone_fast-trunk:
variables:
UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates
commands:
- git clone git@github.cds.internal.unity3d.com:unity/utr.git TestProjects/SRP_SmokeTest/utr
- curl -s https://artifactory.internal.unity3d.com/core-automation/tools/utr-standalone/utr.bat --output TestProjects/SRP_SmokeTest/utr.bat
- pip install unity-downloader-cli --extra-index-url https://artifactory.internal.unity3d.com/api/pypi/common-python/simple --upgrade
- cd TestProjects/SRP_SmokeTest && unity-downloader-cli --source-file ../../unity_revision.txt -c editor --wait --published-only
- cd TestProjects/SRP_SmokeTest && utr\utr --suite=playmode --platform=StandaloneWindows64 --testproject=. --editor-location=.Editor --artifacts_path=test-results --timeout=1200
- cd TestProjects/SRP_SmokeTest && utr --suite=playmode --platform=StandaloneWindows64 --testproject=. --editor-location=.Editor --artifacts_path=test-results --timeout=1200
dependencies:
- path: .yamato/_editor.yml#editor:priming:fast-trunk:windows
rerun: on-new-revision
Expand All @@ -166,10 +158,10 @@ smoke_test_playmode_fast-trunk:
variables:
UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates
commands:
- git clone git@github.cds.internal.unity3d.com:unity/utr.git TestProjects/SRP_SmokeTest/utr
- curl -s https://artifactory.internal.unity3d.com/core-automation/tools/utr-standalone/utr.bat --output TestProjects/SRP_SmokeTest/utr.bat
- pip install unity-downloader-cli --extra-index-url https://artifactory.internal.unity3d.com/api/pypi/common-python/simple --upgrade
- cd TestProjects/SRP_SmokeTest && unity-downloader-cli --source-file ../../unity_revision.txt -c editor --wait --published-only
- cd TestProjects/SRP_SmokeTest && utr\utr --suite=playmode --testproject=. --editor-location=.Editor --artifacts_path=test-results
- cd TestProjects/SRP_SmokeTest && utr --suite=playmode --testproject=. --editor-location=.Editor --artifacts_path=test-results
dependencies:
- path: .yamato/_editor.yml#editor:priming:fast-trunk:windows
rerun: on-new-revision
Expand All @@ -186,10 +178,10 @@ smoke_test_editmode_fast-trunk:
variables:
UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates
commands:
- git clone git@github.cds.internal.unity3d.com:unity/utr.git TestProjects/SRP_SmokeTest/utr
- curl -s https://artifactory.internal.unity3d.com/core-automation/tools/utr-standalone/utr.bat --output TestProjects/SRP_SmokeTest/utr.bat
- pip install unity-downloader-cli --extra-index-url https://artifactory.internal.unity3d.com/api/pypi/common-python/simple --upgrade
- cd TestProjects/SRP_SmokeTest && unity-downloader-cli --source-file ../../unity_revision.txt -c editor --wait --published-only
- cd TestProjects/SRP_SmokeTest && utr\utr --suite=editor --platform=editmode --testproject=. --editor-location=.Editor --artifacts_path=test-results
- cd TestProjects/SRP_SmokeTest && utr --suite=editor --platform=editmode --testproject=. --editor-location=.Editor --artifacts_path=test-results
dependencies:
- path: .yamato/_editor.yml#editor:priming:fast-trunk:windows
rerun: on-new-revision
Expand All @@ -213,12 +205,8 @@ all_project_ci_fast-trunk:
rerun: on-new-revision
- path: .yamato/all-universal.yml#All_Universal_fast-trunk
rerun: on-new-revision
- path: .yamato/all-universal_stereo.yml#All_Universal_Stereo_fast-trunk
rerun: on-new-revision
- path: .yamato/all-shadergraph.yml#All_ShaderGraph_fast-trunk
rerun: on-new-revision
- path: .yamato/all-shadergraph_stereo.yml#All_ShaderGraph_Stereo_fast-trunk
rerun: on-new-revision
- path: .yamato/all-hdrp.yml#All_HDRP_fast-trunk
rerun: on-new-revision
- path: .yamato/all-vfx_hdrp.yml#All_VFX_HDRP_fast-trunk
Expand Down Expand Up @@ -258,10 +246,10 @@ smoke_test_Standalone_CUSTOM-REVISION:
UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates
CUSTOM_REVISION: custom_revision_not_set
commands:
- git clone git@github.cds.internal.unity3d.com:unity/utr.git TestProjects/SRP_SmokeTest/utr
- curl -s https://artifactory.internal.unity3d.com/core-automation/tools/utr-standalone/utr.bat --output TestProjects/SRP_SmokeTest/utr.bat
- pip install unity-downloader-cli --extra-index-url https://artifactory.internal.unity3d.com/api/pypi/common-python/simple --upgrade
- cd TestProjects/SRP_SmokeTest && unity-downloader-cli --source-file ../../unity_revision.txt -c editor --wait --published-only
- cd TestProjects/SRP_SmokeTest && utr\utr --suite=playmode --platform=StandaloneWindows64 --testproject=. --editor-location=.Editor --artifacts_path=test-results --timeout=1200
- cd TestProjects/SRP_SmokeTest && utr --suite=playmode --platform=StandaloneWindows64 --testproject=. --editor-location=.Editor --artifacts_path=test-results --timeout=1200
dependencies:
- path: .yamato/_editor.yml#editor:priming:CUSTOM-REVISION:windows
rerun: always
Expand All @@ -279,10 +267,10 @@ smoke_test_playmode_CUSTOM-REVISION:
UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates
CUSTOM_REVISION: custom_revision_not_set
commands:
- git clone git@github.cds.internal.unity3d.com:unity/utr.git TestProjects/SRP_SmokeTest/utr
- curl -s https://artifactory.internal.unity3d.com/core-automation/tools/utr-standalone/utr.bat --output TestProjects/SRP_SmokeTest/utr.bat
- pip install unity-downloader-cli --extra-index-url https://artifactory.internal.unity3d.com/api/pypi/common-python/simple --upgrade
- cd TestProjects/SRP_SmokeTest && unity-downloader-cli --source-file ../../unity_revision.txt -c editor --wait --published-only
- cd TestProjects/SRP_SmokeTest && utr\utr --suite=playmode --testproject=. --editor-location=.Editor --artifacts_path=test-results
- cd TestProjects/SRP_SmokeTest && utr --suite=playmode --testproject=. --editor-location=.Editor --artifacts_path=test-results
dependencies:
- path: .yamato/_editor.yml#editor:priming:CUSTOM-REVISION:windows
rerun: always
Expand All @@ -300,10 +288,10 @@ smoke_test_editmode_CUSTOM-REVISION:
UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates
CUSTOM_REVISION: custom_revision_not_set
commands:
- git clone git@github.cds.internal.unity3d.com:unity/utr.git TestProjects/SRP_SmokeTest/utr
- curl -s https://artifactory.internal.unity3d.com/core-automation/tools/utr-standalone/utr.bat --output TestProjects/SRP_SmokeTest/utr.bat
- pip install unity-downloader-cli --extra-index-url https://artifactory.internal.unity3d.com/api/pypi/common-python/simple --upgrade
- cd TestProjects/SRP_SmokeTest && unity-downloader-cli --source-file ../../unity_revision.txt -c editor --wait --published-only
- cd TestProjects/SRP_SmokeTest && utr\utr --suite=editor --platform=editmode --testproject=. --editor-location=.Editor --artifacts_path=test-results
- cd TestProjects/SRP_SmokeTest && utr --suite=editor --platform=editmode --testproject=. --editor-location=.Editor --artifacts_path=test-results
dependencies:
- path: .yamato/_editor.yml#editor:priming:CUSTOM-REVISION:windows
rerun: always
Expand All @@ -329,12 +317,8 @@ all_project_ci_CUSTOM-REVISION:
rerun: always
- path: .yamato/all-universal.yml#All_Universal_CUSTOM-REVISION
rerun: always
- path: .yamato/all-universal_stereo.yml#All_Universal_Stereo_CUSTOM-REVISION
rerun: always
- path: .yamato/all-shadergraph.yml#All_ShaderGraph_CUSTOM-REVISION
rerun: always
- path: .yamato/all-shadergraph_stereo.yml#All_ShaderGraph_Stereo_CUSTOM-REVISION
rerun: always
- path: .yamato/all-hdrp.yml#All_HDRP_CUSTOM-REVISION
rerun: always
- path: .yamato/all-vfx_hdrp.yml#All_VFX_HDRP_CUSTOM-REVISION
Expand Down
4 changes: 4 additions & 0 deletions .yamato/_packages.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2087,3 +2087,7 @@ publish_all:
commands:
- git tag v$(cd com.unity.render-pipelines.core && node -e "console.log(require('./package.json').version)")
- git push origin --tags
triggers:
recurring:
- branch: master
frequency: daily
Loading

0 comments on commit d2081c2

Please sign in to comment.