Skip to content

Commit c085dd1

Browse files
theo-at-unitytheo-at-unity
authored
Merge pull request #8223 from Unity-Technologies/fix-yamato-ci
Fix Yamato CI
2 parents 6893602 + 15753e4 commit c085dd1

10 files changed

+664
-101
lines changed

‎.yamato/_abv.yml‎

Lines changed: 7 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,15 @@
1-
2-
# This file is generated by ant_yaml_generation package, don't edit this file manually.
3-
# Introduce any changes under .yamato/config/*.metafile files and rerun yaml-generation (or check #devs-automation-tooling).
4-
5-
6-
---
7-
8-
graphics_repo_nightly_6000.4:
9-
name: Graphics repo nightly on 6000.4
1+
graphics_repo_nightly_trunk:
2+
name: Graphics repo nightly on trunk on trunk
103
variables:
11-
CUSTOM_REVISION: '6000.4/staging'
4+
CUSTOM_REVISION: 'trunk'
125
TEST_FILTER: .*
136
UTR_VERSION: "current"
147
triggers:
158
recurring:
169
- branch: master
1710
frequency: weekly
1811
dependencies:
19-
- path: .yamato/_templates.yml#all_template_ci_6000.4
20-
rerun: always
12+
- path: .yamato/_templates.yml#all_template_ci_trunk
13+
rerun: always
14+
- path: .yamato/all-postprocessing.yml#PostProcessing_trunk
15+
rerun: always

‎.yamato/_editor_priming.yml‎

Lines changed: 9 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,12 @@
1-
2-
# This file is generated by ant_yaml_generation package, don't edit this file manually.
3-
# Introduce any changes under .yamato/config/*.metafile files and rerun yaml-generation (or check #devs-automation-tooling).
4-
5-
6-
---
7-
8-
editor:priming:6000.4:Win:
9-
name: '[6000.4,Win] Editor priming'
1+
editor:priming:trunk:Win:
2+
name: '[trunk,Win] Editor priming'
103
agent:
114
type: Unity::VM
125
image: package-ci/ubuntu-22.04:v4
136
flavor: b1.small
147
skip_checkout: true
158
variables:
16-
CUSTOM_REVISION: '6000.4/staging'
9+
CUSTOM_REVISION: 'trunk'
1710
DISPLAY: ":0"
1811
PATH: /home/bokken/bin:/home/bokken/.local/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin:/sbin:/home/bokken/.npm-global/bin
1912
UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates
@@ -51,15 +44,15 @@ editor:priming:test_min_editor:Win:
5144
unity_revision.zip:
5245
paths:
5346
- "unity_revision.txt"
54-
editor:priming:6000.4:OSX:
55-
name: '[6000.4,OSX] Editor priming'
47+
editor:priming:trunk:OSX:
48+
name: '[trunk,OSX] Editor priming'
5649
agent:
5750
type: Unity::VM
5851
image: package-ci/ubuntu-22.04:v4
5952
flavor: b1.small
6053
skip_checkout: true
6154
variables:
62-
CUSTOM_REVISION: '6000.4/staging'
55+
CUSTOM_REVISION: 'trunk'
6356
DISPLAY: ":0"
6457
PATH: /home/bokken/bin:/home/bokken/.local/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin:/sbin:/home/bokken/.npm-global/bin
6558
UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates
@@ -97,15 +90,15 @@ editor:priming:test_min_editor:OSX:
9790
unity_revision.zip:
9891
paths:
9992
- "unity_revision.txt"
100-
editor:priming:6000.4:Linux:
101-
name: '[6000.4,Linux] Editor priming'
93+
editor:priming:trunk:Linux:
94+
name: '[trunk,Linux] Editor priming'
10295
agent:
10396
type: Unity::VM
10497
image: package-ci/ubuntu-22.04:v4
10598
flavor: b1.small
10699
skip_checkout: true
107100
variables:
108-
CUSTOM_REVISION: '6000.4/staging'
101+
CUSTOM_REVISION: 'trunk'
109102
DISPLAY: ":0"
110103
PATH: /home/bokken/bin:/home/bokken/.local/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin:/sbin:/home/bokken/.npm-global/bin
111104
UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates

‎.yamato/_postprocessing_publish.yml‎

Lines changed: 115 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,115 @@
1+
2+
# From https://github.com/Unity-Technologies/PostProcessing/blob/v2/.yamato/upm-ci.yml
3+
4+
name: postprocessing
5+
test_editors:
6+
# This should start from the earliest supported stream (specified in the package.json file). Right now this is 2019.4.
7+
- 2019.4
8+
- 2020.3
9+
- 2021.3
10+
- 2022.3
11+
- 6000.0
12+
- 6000.2
13+
- 6000.3
14+
- 6000.4
15+
- trunk
16+
test_platforms:
17+
- name: win
18+
type: Unity::VM
19+
image: package-ci/win10:v4
20+
flavor: b1.large
21+
- name: mac
22+
type: Unity::VM::osx
23+
image: package-ci/macos-13:v4
24+
flavor: m1.mac
25+
---
26+
{{ name }}_pack:
27+
name: {{ name }} - Pack
28+
agent:
29+
type: Unity::VM
30+
image: package-ci/win10:v4
31+
flavor: b1.large
32+
commands:
33+
- npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm
34+
- upm-ci package pack --package-path com.unity.postprocessing
35+
artifacts:
36+
packages:
37+
paths:
38+
- "upm-ci~/**/*"
39+
40+
{% for editor in test_editors %}
41+
{% for platform in test_platforms %}
42+
{{ name }}_test_{{ platform.name }}_{{ editor }}:
43+
name : {{ name }} - Test {{ editor }} on {{ platform.name }}
44+
agent:
45+
type: {{ platform.type }}
46+
image: {{ platform.image }}
47+
flavor: {{ platform.flavor}}
48+
commands:
49+
- npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm
50+
- upm-ci package test --unity-version {{ editor }} --package-path com.unity.postprocessing --extra-utr-arg="--compilation-errors-as-warnings"
51+
artifacts:
52+
logs:
53+
paths:
54+
- "upm-ci~/test-results/**/*"
55+
dependencies:
56+
- .yamato/_postprocessing_publish.yml#{{ name }}_pack
57+
{% endfor %}
58+
{% endfor %}
59+
60+
{{ name }}_test_trigger:
61+
name: {{ name }} - Tests Trigger
62+
dependencies:
63+
- .yamato/_postprocessing_publish.yml#{{ name }}_pack
64+
{% for editor in test_editors %}
65+
{% for platform in test_platforms %}
66+
- .yamato/_postprocessing_publish.yml#{{ name }}_test_{{platform.name}}_{{editor}}
67+
{% endfor %}
68+
{% endfor %}
69+
70+
{{ name }}_publish:
71+
name: {{ name }} - Publish to Internal Registry
72+
agent:
73+
type: Unity::VM
74+
image: package-ci/win10:v4
75+
flavor: b1.large
76+
variables:
77+
UPMCI_ENABLE_PACKAGE_SIGNING: 1
78+
commands:
79+
- npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm
80+
- upm-ci package publish --package-path com.unity.postprocessing
81+
artifacts:
82+
artifacts:
83+
paths:
84+
- "upm-ci~/packages/*.tgz"
85+
dependencies:
86+
- .yamato/_postprocessing_publish.yml#{{ name }}_pack
87+
{% for editor in test_editors %}
88+
{% for platform in test_platforms %}
89+
- .yamato/_postprocessing_publish.yml#{{ name }}_test_{{ platform.name }}_{{ editor }}
90+
{% endfor %}
91+
{% endfor %}
92+
93+
94+
{{ name }}_publish_dry_run:
95+
name: {{ name }} - Publish to Internal Registry [dry-run]
96+
agent:
97+
type: Unity::VM
98+
image: package-ci/win10:v4
99+
flavor: b1.large
100+
variables:
101+
UPMCI_ENABLE_PACKAGE_SIGNING: 1
102+
commands:
103+
- npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm
104+
- upm-ci package publish --dry-run --package-path com.unity.postprocessing
105+
artifacts:
106+
artifacts:
107+
paths:
108+
- "upm-ci~/packages/*.tgz"
109+
dependencies:
110+
- .yamato/_postprocessing_publish.yml#{{ name }}_pack
111+
{% for editor in test_editors %}
112+
{% for platform in test_platforms %}
113+
- .yamato/_postprocessing_publish.yml#{{ name }}_test_{{ platform.name }}_{{ editor }}
114+
{% endfor %}
115+
{% endfor %}

0 commit comments

Comments
 (0)