Skip to content

Commit 1f1070c

Browse files
noellie-veleznoellie-velez
authored
Merge branch 'develop-2.0.0' into chore/v2.x/testproject-editor-upgrade-6000.0.60f1
2 parents 0e7c72b + 37bdf52 commit 1f1070c

31 files changed

+670
-123
lines changed

‎.pr_agent.toml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
[github_app]
2+
pr_commands = []

‎.yamato/project-updated-dependencies-test.yml‎

Lines changed: 22 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,28 @@ updated-dependencies_{{ project.name }}_NGO_{{ platform.name }}_{{ editor }}:
4242
paths:
4343
- "upm-ci~/test-results/**/*"
4444
dependencies:
45-
- .yamato/package-pack.yml#package_pack_-_ngo_{{ platform.name }}
45+
- .yamato/project-updated-dependencies-test.yml#project_pack_-_{{ project.name }}_{{ platform.name }}
4646
{% endfor -%}
4747
{% endfor -%}
4848
{% endfor -%}
49+
50+
51+
# TODO: This job was removed on PR-3711 but the above job somehow can find proper artifacts with package pack job.
52+
# This job should be removed when issue will be resolved since it's not used anywhere
53+
{% for project in projects.all -%}
54+
{% for platform in test_platforms.desktop -%}
55+
project_pack_-_{{ project.name }}_{{ platform.name }}:
56+
name: Project Pack - {{ project.name }} [{{ platform.name }}]
57+
agent:
58+
type: {{ platform.type }}
59+
image: {{ platform.image }}
60+
flavor: {{ platform.flavor }}
61+
commands:
62+
- npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm # upm-ci is not preinstalled on the image so we need to download it
63+
- upm-ci project pack --project-path {{ project.path }}
64+
artifacts:
65+
packages:
66+
paths:
67+
- "upm-ci~/packages/**/*"
68+
{% endfor -%}
69+
{% endfor -%}

‎.yamato/wrench/preview-a-p-v.yml‎

Lines changed: 163 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -839,3 +839,166 @@ preview_apv_-_6000_5_-_windows:
839839
Job Maintainers: '#rm-packageworks'
840840
Wrench: 1.3.0.0
841841

842+
# Functional tests for dependents found in the latest 6000.5 manifest (MacOS).
843+
preview_apv_-_6000_5_-_macos:
844+
name: Preview APV - 6000.5 - macos
845+
agent:
846+
image: package-ci/macos-13:default
847+
type: Unity::VM::osx
848+
flavor: b1.xlarge
849+
commands:
850+
- command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-3-0_3978eda62a03e3dbc469ab77590d20f8832032d8e0b586550597b7f590baefec.zip -o wrench-localapv.zip
851+
- command: 7z x -aoa wrench-localapv.zip
852+
- command: pip install semver requests --index-url https://artifactory-slo.bf.unity3d.com/artifactory/api/pypi/pypi/simple
853+
- command: python PythonScripts/print_machine_info.py
854+
- command: npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm
855+
timeout: 20
856+
retries: 10
857+
- command: unity-downloader-cli -u trunk -c editor --path .Editor --fast
858+
timeout: 10
859+
retries: 3
860+
- command: python PythonScripts/preview_apv.py --wrench-config=.yamato/wrench/wrench_config.json --editor-version=6000.5 --testsuite=editor,playmode --artifacts-path=PreviewApvArtifacts~
861+
- command: echo 'Skipping Editor Manifest Validator as it is only supported on Windows'
862+
after:
863+
- command: bash .yamato/generated-scripts/infrastructure-instability-detection-mac.sh
864+
artifacts:
865+
Crash Dumps:
866+
paths:
867+
- CrashDumps/**
868+
logs:
869+
paths:
870+
- '*.log'
871+
- '*.xml'
872+
- upm-ci~/test-results/**/*
873+
- upm-ci~/temp/*/Logs/**
874+
- upm-ci~/temp/*/Library/*.log
875+
- upm-ci~/temp/*/*.log
876+
- upm-ci~/temp/Builds/*.log
877+
packages:
878+
paths:
879+
- upm-ci~/packages/**/*
880+
PreviewAPVResults:
881+
paths:
882+
- PreviewApvArtifacts~/**
883+
- APVTest/**/manifest.json
884+
pvp-results:
885+
paths:
886+
- upm-ci~/pvp/**/*
887+
browsable: onDemand
888+
dependencies:
889+
- path: .yamato/wrench/package-pack-jobs.yml#package_pack_-_netcode_gameobjects
890+
variables:
891+
UPMPVP_CONTEXT_WRENCH: 1.2.0.0
892+
metadata:
893+
Job Maintainers: '#rm-packageworks'
894+
Wrench: 1.2.0.0
895+
896+
# Functional tests for dependents found in the latest 6000.5 manifest (Ubuntu).
897+
preview_apv_-_6000_5_-_ubuntu:
898+
name: Preview APV - 6000.5 - ubuntu
899+
agent:
900+
image: package-ci/ubuntu-22.04:v4
901+
type: Unity::VM
902+
flavor: b1.large
903+
commands:
904+
- command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-3-0_3978eda62a03e3dbc469ab77590d20f8832032d8e0b586550597b7f590baefec.zip -o wrench-localapv.zip
905+
- command: 7z x -aoa wrench-localapv.zip
906+
- command: pip install semver requests --index-url https://artifactory-slo.bf.unity3d.com/artifactory/api/pypi/pypi/simple
907+
- command: python PythonScripts/print_machine_info.py
908+
- command: npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm
909+
timeout: 20
910+
retries: 10
911+
- command: unity-downloader-cli -u trunk -c editor --path .Editor --fast
912+
timeout: 10
913+
retries: 3
914+
- command: python PythonScripts/preview_apv.py --wrench-config=.yamato/wrench/wrench_config.json --editor-version=6000.5 --testsuite=editor,playmode --artifacts-path=PreviewApvArtifacts~
915+
- command: echo 'Skipping Editor Manifest Validator as it is only supported on Windows'
916+
after:
917+
- command: bash .yamato/generated-scripts/infrastructure-instability-detection-linux.sh
918+
artifacts:
919+
Crash Dumps:
920+
paths:
921+
- CrashDumps/**
922+
logs:
923+
paths:
924+
- '*.log'
925+
- '*.xml'
926+
- upm-ci~/test-results/**/*
927+
- upm-ci~/temp/*/Logs/**
928+
- upm-ci~/temp/*/Library/*.log
929+
- upm-ci~/temp/*/*.log
930+
- upm-ci~/temp/Builds/*.log
931+
packages:
932+
paths:
933+
- upm-ci~/packages/**/*
934+
PreviewAPVResults:
935+
paths:
936+
- PreviewApvArtifacts~/**
937+
- APVTest/**/manifest.json
938+
pvp-results:
939+
paths:
940+
- upm-ci~/pvp/**/*
941+
browsable: onDemand
942+
dependencies:
943+
- path: .yamato/wrench/package-pack-jobs.yml#package_pack_-_netcode_gameobjects
944+
variables:
945+
UPMPVP_CONTEXT_WRENCH: 1.2.0.0
946+
metadata:
947+
Job Maintainers: '#rm-packageworks'
948+
Wrench: 1.2.0.0
949+
950+
# Functional tests for dependents found in the latest 6000.5 manifest (Windows).
951+
preview_apv_-_6000_5_-_windows:
952+
name: Preview APV - 6000.5 - windows
953+
agent:
954+
image: package-ci/win10:default
955+
type: Unity::VM
956+
flavor: b1.large
957+
commands:
958+
- command: gsudo reg add "HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\FileSystem" /v LongPathsEnabled /t REG_DWORD /d 1 /f
959+
- command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-3-0_3978eda62a03e3dbc469ab77590d20f8832032d8e0b586550597b7f590baefec.zip -o wrench-localapv.zip
960+
- command: 7z x -aoa wrench-localapv.zip
961+
- command: pip install semver requests --index-url https://artifactory-slo.bf.unity3d.com/artifactory/api/pypi/pypi/simple
962+
- command: python PythonScripts/print_machine_info.py
963+
- command: npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm
964+
timeout: 20
965+
retries: 10
966+
- command: unity-downloader-cli -u trunk -c editor --path .Editor --fast
967+
timeout: 10
968+
retries: 3
969+
- command: python PythonScripts/preview_apv.py --wrench-config=.yamato/wrench/wrench_config.json --editor-version=6000.5 --testsuite=editor,playmode --artifacts-path=PreviewApvArtifacts~
970+
- command: python PythonScripts/editor_manifest_validator.py --version=6000.5 --wrench-config=.yamato/wrench/wrench_config.json
971+
after:
972+
- command: .yamato\generated-scripts\infrastructure-instability-detection-win.cmd
973+
artifacts:
974+
Crash Dumps:
975+
paths:
976+
- CrashDumps/**
977+
logs:
978+
paths:
979+
- '*.log'
980+
- '*.xml'
981+
- upm-ci~/test-results/**/*
982+
- upm-ci~/temp/*/Logs/**
983+
- upm-ci~/temp/*/Library/*.log
984+
- upm-ci~/temp/*/*.log
985+
- upm-ci~/temp/Builds/*.log
986+
packages:
987+
paths:
988+
- upm-ci~/packages/**/*
989+
PreviewAPVResults:
990+
paths:
991+
- PreviewApvArtifacts~/**
992+
- APVTest/**/manifest.json
993+
pvp-results:
994+
paths:
995+
- upm-ci~/pvp/**/*
996+
browsable: onDemand
997+
dependencies:
998+
- path: .yamato/wrench/package-pack-jobs.yml#package_pack_-_netcode_gameobjects
999+
variables:
1000+
UPMPVP_CONTEXT_WRENCH: 1.2.0.0
1001+
metadata:
1002+
Job Maintainers: '#rm-packageworks'
1003+
Wrench: 1.2.0.0
1004+

0 commit comments

Comments
 (0)