Skip to content

Commit 33bb021

Browse files
committed
Modify yml jobs
Deleted project-promotion and project-publish jobs since those were replaced by wrench. Deleted outdated tests and first pass update was performed
1 parent bff898f commit 33bb021

14 files changed

+57
-362
lines changed

.yamato/_run-all.yml

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -109,19 +109,6 @@ all_compatibility_tests:
109109
{% endfor -%}
110110
{% endfor -%}
111111

112-
all_singlenode_multiprocess_tests:
113-
name: Run All Multiprocess Tests - Single Node
114-
dependencies:
115-
{% for platform in test_platforms -%}
116-
{% for project in projects -%}
117-
{% for editor in project.test_editors -%}
118-
{% if editor != "trunk" %}
119-
- .yamato/multiprocess-project-tests.yml#singlenode_multiprocess_test_testproject_{{ editor }}_{{ platform.name }}
120-
{% endif %}
121-
{% endfor -%}
122-
{% endfor -%}
123-
{% endfor -%}
124-
125112
all_project_tests_standalone:
126113
name: Run All Project Tests - Standalone
127114
dependencies:

.yamato/_triggers.yml

Lines changed: 4 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ develop_nightly:
1111
- .yamato/_run-all.yml#run_all_tests
1212
{% for project in projects -%}
1313
{% if project.has_tests == "true" -%}
14-
- .yamato/code-coverage.yml#code_coverage_win_{{ project.name }}_{{ validation_editor }}
14+
- .yamato/code-coverage.yml#code_coverage_win_{{ project.name }}_{{ validation_editors.last }}
1515
{% endif -%}
1616
{% endfor -%}
1717

@@ -25,27 +25,17 @@ develop_weekly_trunk:
2525
dependencies:
2626
- .yamato/_run-all.yml#run_all_tests_trunk
2727

28-
multiprocess_nightly:
29-
name: "\U0001F319 [Nightly] Run Multiprocess Tests"
30-
triggers:
31-
recurring:
32-
- branch: develop-2.0.0
33-
frequency: daily
34-
rerun: always
35-
dependencies:
36-
- .yamato/_run-all.yml#all_singlenode_multiprocess_tests
37-
3828
# Run all relevant tasks when a pull request targeting the develop
3929
# branch is created or updated. Currently only netcode package tests are
4030
# enabled, since the others are missing test coverage and will fail CI.
4131
pull_request_trigger:
42-
name: Pull Request Trigger (master, develop, develop-2.0.0, & release branches)
32+
name: Pull Request Trigger (develop, develop-2.0.0, & release branches)
4333
dependencies:
4434
- .yamato/project-standards.yml#standards_{{ projects.first.name }}
4535
{% for project in projects -%}
4636
{% for package in project.packages -%}
4737
{% if project.validate == "true" -%}
48-
- .yamato/project-publish.yml#validate_{{ package.name }}_{{ test_platforms.first.name }}_{{ validation_editor }}
38+
- .yamato/wrench/project-publish.yml#validate_{{ package.name }}_{{ test_platforms.first.name }}_{{ validation_editors.last }}
4939
{% endif -%}
5040
{% endfor -%}
5141
{% for platform in test_platforms -%}
@@ -60,41 +50,6 @@ pull_request_trigger:
6050
pull_requests:
6151
- targets:
6252
only:
63-
- "master"
6453
- "develop"
6554
- "develop-2.0.0"
66-
- "/release\/.*/"
67-
68-
# Currently, we need to have a trigger to updated badges
69-
# Only package badges currently exist
70-
badges_test_trigger:
71-
name: ⚡ Badges Tests Trigger
72-
agent:
73-
type: Unity::VM
74-
image: package-ci/ubuntu-22.04:v4
75-
flavor: b1.small
76-
commands:
77-
- npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm
78-
- upm-ci package izon -t
79-
artifacts:
80-
logs:
81-
paths:
82-
- "upm-ci~/test-results/**/*"
83-
packages:
84-
paths:
85-
- "upm-ci~/packages/**/*"
86-
dependencies:
87-
{% for project in projects -%}
88-
{% for package in project.packages -%}
89-
{% if project.validate == "true" -%}
90-
- .yamato/project-publish.yml#validate_{{ package.name }}_{{ test_platforms.first.name }}_{{ validation_editor }}
91-
{% endif -%}
92-
{% for editor in project.test_editors -%}
93-
{% if editor != "trunk" -%}
94-
{% for platform in test_platforms -%}
95-
- .yamato/package-tests.yml#test_{{ project.name }}_{{ package.name }}_{{ editor }}_{{ platform.name }}
96-
{% endfor -%}
97-
{% endif -%}
98-
{% endfor -%}
99-
{% endfor -%}
100-
{% endfor -%}
55+
- "/release\/.*/"

.yamato/code-coverage.yml

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,20 @@
11
{% metadata_file .yamato/project.metafile %}
22
---
3+
# Support for code coverage in public repos is not yet available
34
{% for project in projects -%}
45
{% if project.has_tests == "true" -%}
5-
code_coverage_win_{{ project.name }}_{{ validation_editor }}:
6-
name: Code Coverage Report - Windows - {{ project.name }} - {{ validation_editor }}
6+
{% for platform in test_platforms -%}
7+
{% if platform.name == "win" -%}
8+
code_coverage_win_{{ project.name }}_{{ validation_editors.last }}:
9+
name: Code Coverage Report - Windows - {{ project.name }} - {{ validation_editors.last }}
710
agent:
8-
type: Unity::VM
9-
image: package-ci/win10:v4
10-
flavor: b1.large
11+
type: platform.type
12+
image: platform.image
13+
flavor: platform.flavor
1114
commands:
1215
- pip install unity-downloader-cli --upgrade --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple
1316
- npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm
14-
- unity-downloader-cli -u {{ validation_editor }} -c editor --wait --fast
17+
- unity-downloader-cli -u {{ validation_editors.last }} -c editor --wait --fast
1518
- upm-ci package test -u .Editor --package-path com.unity.netcode.gameobjects --enable-code-coverage --code-coverage-options 'enableCyclomaticComplexity;generateAdditionalMetrics;generateHtmlReport;assemblyFilters:+Unity.Netcode.Editor,+Unity.Netcode.Runtime,+Unity.Netcode.Components'
1619
artifacts:
1720
logs:
@@ -20,4 +23,6 @@ code_coverage_win_{{ project.name }}_{{ validation_editor }}:
2023
dependencies:
2124
- .yamato/project-pack.yml#pack_{{ project.name }}
2225
{% endif -%}
26+
{% endfor -%}
27+
{% endif -%}
2328
{% endfor -%}

.yamato/mobile-build-and-test.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ build_{{ project.name }}_tests_{{ editor }}_android:
1616
- python .yamato/disable-burst-if-requested.py --project-path testproject --platform Android
1717
- unity-downloader-cli -u {{ editor }} -c editor -c Android -w --fast
1818
- |
19-
set UTR_VERSION=0.12.0
19+
set UTR_VERSION=1.35.1
2020
utr.bat --artifacts_path=artifacts --timeout=1800 --testproject={{ project.name }} --editor-location=.Editor --suite=playmode --platform=android --build-only --player-save-path=build/players --extra-editor-arg=-batchmode --extra-editor-arg=-nographics --testfilter=Unity.Netcode.RuntimeTests
2121
artifacts:
2222
logs:
@@ -53,7 +53,7 @@ build_{{ project.name }}_tests_{{ editor }}_iOS:
5353
- unity-downloader-cli -u {{ editor }} -c editor -c iOS -w --fast
5454
- curl -s https://artifactory.prd.it.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr --output utr
5555
- chmod +x ./utr
56-
- export UTR_VERSION=0.12.0
56+
- export UTR_VERSION=1.35.1
5757
- ./utr --artifacts_path=artifacts --timeout=1800 --testproject={{ project.name }} --editor-location=.Editor --suite=playmode --platform=iOS --build-only --player-save-path=build/players --extra-editor-arg=-batchmode --extra-editor-arg=-nographics --testfilter=Unity.Netcode.RuntimeTests
5858
artifacts:
5959
logs:
@@ -92,7 +92,7 @@ run_{{ project.name }}_tests_{{ editor }}_iOS:
9292
# Give UTR execution permissions
9393
- chmod +x ./utr
9494
# Run the test build on the device
95-
- export UTR_VERSION=0.12.0
95+
- export UTR_VERSION=1.35.1
9696
- ./utr -artifacts_path=artifacts --testproject={{ project.name }} --editor-location=.Editor --reruncount=2 --suite=playmode --platform=iOS --player-load-path=build/players --testfilter=Unity.Netcode.RuntimeTests
9797
artifacts:
9898
logs:
@@ -132,7 +132,7 @@ run_{{ project.name }}_tests_{{ editor }}_android:
132132
set ANDROID_DEVICE_CONNECTION=%BOKKEN_DEVICE_IP%
133133
start %ANDROID_SDK_ROOT%\platform-tools\adb.exe connect %BOKKEN_DEVICE_IP%
134134
start %ANDROID_SDK_ROOT%\platform-tools\adb.exe devices
135-
set UTR_VERSION=0.12.0
135+
set UTR_VERSION=1.35.1
136136
./utr --artifacts_path=artifacts --testproject={{ project.name }} --editor-location=.Editor --reruncount=2 --suite=playmode --platform=android --player-connection-ip=%BOKKEN_HOST_IP% --player-load-path=build/players --testfilter=Unity.Netcode.RuntimeTests
137137
# Set uploadable artifact paths
138138
artifacts:

.yamato/package-tests.yml

Lines changed: 2 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@
77
# the results with package tests
88
{% for project in projects -%}
99
{% for package in project.packages -%}
10-
{% for editor in project.test_editors -%}
10+
{% for editor in validation_editors -%}
1111
{% for platform in test_platforms -%}
12-
test_{{project.name}}_{{ package.name }}_{{ editor }}_{{ platform.name }}:
12+
test_{{project.name}}_{{ package.name }}_{{ editor }}_{{ platform.name }}:
1313
name : {{ project.name }} - {{ package.name }} package tests - {{ editor }} on {{ platform.name }}
1414
agent:
1515
type: {{ platform.type }}
@@ -27,31 +27,4 @@ test_{{project.name}}_{{ package.name }}_{{ editor }}_{{ platform.name }}:
2727
{% endfor -%}
2828
{% endfor -%}
2929
{% endfor -%}
30-
{% endfor -%}
31-
32-
# Test minimal project with different versions of dependencies
33-
{% for project in projects -%}
34-
{% if project.name == "minimalproject" -%}
35-
{% for dependency in dependencies -%}
36-
{% for editor in dependency.test_editors -%}
37-
{% for platform in test_platforms -%}
38-
test_compatibility_{{project.name}}_{{ project.packages.first.name }}_with_{{ dependency.name }}@{{ dependency.version }}_{{ editor }}_{{ platform.name }}:
39-
name : {{ project.name }} - {{ project.packages.first.name }} with {{ dependency.name }}@{{ dependency.version }} - {{ editor }} on {{ platform.name }}
40-
agent:
41-
type: {{ platform.type }}
42-
image: {{ platform.image }}
43-
flavor: {{ platform.flavor}}
44-
commands:
45-
- npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm
46-
- {% if platform.name == "ubuntu" %}DISPLAY=:0 {% endif %}upm-ci project test -u {{ editor }} --type project-tests --project-path {{ project.name }} --package-filter {{ project.packages.first.name }}
47-
artifacts:
48-
logs:
49-
paths:
50-
- "upm-ci~/test-results/**/*"
51-
dependencies:
52-
- .yamato/project-pack.yml#pack_{{ project.name }}_{{ dependency.name }}@{{ dependency.version }}
53-
{% endfor -%}
54-
{% endfor -%}
55-
{% endfor -%}
56-
{% endif -%}
5730
{% endfor -%}

.yamato/project-pack.yml

Lines changed: 7 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -1,44 +1,22 @@
11
{% metadata_file .yamato/project.metafile %}
22
---
3+
34
{% for project in projects -%}
5+
{% for platform in test_platforms -%}
6+
{% if platform.name == "ubuntu" -%}
47
pack_{{ project.name }}:
58
name: Pack {{ project.name }}
69
agent:
7-
type: Unity::VM
8-
image: package-ci/ubuntu-22.04:v4
9-
flavor: b1.small
10-
commands:
11-
- npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm
12-
- upm-ci project pack --project-path {{ project.path }}
13-
artifacts:
14-
packages:
15-
paths:
16-
- "upm-ci~/packages/**/*"
17-
{% endfor -%}
18-
19-
# Pack minimal project with different versions of dependencies
20-
{% for project in projects -%}
21-
{% if project.name == "minimalproject" -%}
22-
{% for dependency in dependencies -%}
23-
pack_{{ project.name }}_{{ dependency.name }}@{{ dependency.version }}:
24-
name: Pack {{ project.name }} with {{ dependency.name }}@{{ dependency.version }}
25-
agent:
26-
type: Unity::VM
27-
image: package-ci/ubuntu-22.04:v4
28-
flavor: b1.small
10+
type: platform.type
11+
image: platform.image
12+
flavor: platform.flavor
2913
commands:
3014
- npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm
31-
- curl -L https://artifactory.prd.it.unity3d.com/artifactory/api/gpg/key/public | sudo apt-key add -
32-
- sudo sh -c "echo 'deb https://artifactory.prd.it.unity3d.com/artifactory/unity-apt-local bionic main' > /etc/apt/sources.list.d/unity.list"
33-
- sudo apt update
34-
- sudo apt install -y unity-config
35-
- unity-config settings project-path {{ project.path }}
36-
- unity-config project add dependency {{ dependency.name }}@{{ dependency.version }}
3715
- upm-ci project pack --project-path {{ project.path }}
3816
artifacts:
3917
packages:
4018
paths:
4119
- "upm-ci~/packages/**/*"
42-
{% endfor -%}
4320
{% endif -%}
21+
{% endfor -%}
4422
{% endfor -%}

.yamato/project-promotion.yml

Lines changed: 0 additions & 74 deletions
This file was deleted.

0 commit comments

Comments
 (0)