Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions .yamato/_triggers.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,9 @@ develop_nightly:
dependencies:
- .yamato/_run-all.yml#run_all_tests
{% for project in projects -%}
{% if project.has_tests == "true" -%}
- .yamato/code-coverage.yml#code_coverage_win_{{ project.name }}_{{ validation_editor }}
{% endif -%}
{% endfor -%}

develop_weekly_trunk:
Expand Down Expand Up @@ -43,7 +45,7 @@ pull_request_trigger:
{% for project in projects -%}
{% for package in project.packages -%}
{% if project.validate == "true" -%}
- .yamato/project-tests.yml#validate_{{ package.name }}_{{ test_platforms.first.name }}_{{ validation_editor }}
- .yamato/project-publish.yml#validate_{{ package.name }}_{{ test_platforms.first.name }}_{{ validation_editor }}
{% endif -%}
{% endfor -%}
{% for platform in test_platforms -%}
Expand Down Expand Up @@ -84,7 +86,7 @@ badges_test_trigger:
{% for project in projects -%}
{% for package in project.packages -%}
{% if project.validate == "true" -%}
- .yamato/project-tests.yml#validate_{{ package.name }}_{{ test_platforms.first.name }}_{{ validation_editor }}
- .yamato/project-publish.yml#validate_{{ package.name }}_{{ test_platforms.first.name }}_{{ validation_editor }}
{% endif -%}
{% for editor in project.test_editors -%}
{% if editor != "trunk" -%}
Expand Down
2 changes: 1 addition & 1 deletion .yamato/package-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ test_{{project.name}}_{{ package.name }}_{{ editor }}_{{ platform.name }}:
flavor: {{ platform.flavor}}
commands:
- npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm
- {% if platform.name == "centos" %}DISPLAY=:0 {% endif %}upm-ci project test -u {{ editor }} --type package-tests --project-path {{ project.name }} --package-filter {{ package.name }}
- {% if platform.name == "ubuntu" %}DISPLAY=:0 {% endif %}upm-ci project test -u {{ editor }} --type package-tests --project-path {{ project.name }} --package-filter {{ package.name }}
artifacts:
logs:
paths:
Expand Down
18 changes: 10 additions & 8 deletions .yamato/project-promotion.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,25 +3,27 @@
{% for project in projects -%}
{% if project.publish == "true" -%}
{% for package in project.packages -%}
# Validation job for package {{ package.name }}, only using the first entry in the
# platform and editor meta data
promotion_validate_{{ project.name }}_{{ package.name }}_{{ test_platforms.first.name }}_{{ validation_editor }}:
name : Validate Project {{ project.name }} - Package {{ package.name }} - {{ validation_editor }} on {{ test_platforms.first.name }}
{% for editor in project.test_editors -%}
{% for platform in test_platforms -%}
promotion_validate_{{ project.name }}_{{ package.name }}_{{ platform.name }}_{{ editor }}:
name : Validate (Vetting Tests) Project {{ project.name }} - Package {{ package.name }} - {{ editor }} on {{ platform.name }}
agent:
type: {{ test_platforms.first.type }}
image: {{ test_platforms.first.image }}
flavor: {{ test_platforms.first.flavor}}
type: {{ platform.type }}
image: {{ platform.image }}
flavor: {{ platform.flavor}}
variables:
UPMCI_PROMOTION: 1
commands:
- npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm
- upm-ci project test -u {{ validation_editor }} --project-path {{ project.path }} --type vetting-tests --project-path {{ project.path }} --package-filter {{ package.name }}
- {% if platform.name == "ubuntu" %}DISPLAY=:0 {% endif %}upm-ci project test -u {{ editor }} --project-path {{ project.path }} --type vetting-tests --project-path {{ project.path }} --package-filter {{ package.name }}
artifacts:
logs:
paths:
- "upm-ci~/test-results/**/*"
dependencies:
- .yamato/project-pack.yml#pack_{{ project.name }}
{% endfor -%}
{% endfor -%}

promote_{{ project.name }}_{{ package.name }}:
name: Promote Project {{ project.name }} - Package {{ package.name }} to Production
Expand Down
20 changes: 20 additions & 0 deletions .yamato/project-publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,26 @@
{% for project in projects -%}
{% if project.publish == "true" -%}
{% for package in project.packages -%}
{% for editor in project.test_editors -%}
{% for platform in test_platforms -%}
validate_{{ package.name }}_{{ platform.name }}_{{ editor }}:
name : Validate (Isolation Tests) Package {{ package.name }} - {{ editor }} on {{ platform.name }}
agent:
type: {{ platform.type }}
image: {{ platform.image }}
flavor: {{ platform.flavor}}
commands:
- npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm
- {% if platform.name == "ubuntu" %}DISPLAY=:0 {% endif %}upm-ci project test -u {{ editor }} --type isolation-tests --project-path {{ project.path }} --package-filter {{ package.name }} --platform editmode
artifacts:
logs:
paths:
- "upm-ci~/test-results/**/*"
dependencies:
- .yamato/project-pack.yml#pack_{{ project.name }}
{% endfor -%}
{% endfor -%}

publish_{{ project.name }}_{{ package.name }}:
name: Publish Project {{project.name }} - Package {{ package.name }} to Internal Registry
agent:
Expand Down
26 changes: 0 additions & 26 deletions .yamato/project-tests.yml
Original file line number Diff line number Diff line change
@@ -1,32 +1,6 @@
{% metadata_file .yamato/project.metafile %}
---

# Validation job for package {{ package.name }}, only using the first entry in the
# platform and editor meta data
# Validation only occurs in editmode.

{% for project in projects -%}
{% if project.validate == "true" %}
{% for package in project.packages -%}
validate_{{ package.name }}_{{ test_platforms.first.name }}_{{ validation_editor }}:
name : Validate Package {{ package.name }} - {{ validation_editor }} on {{ test_platforms.first.name }}
agent:
type: {{ test_platforms.first.type }}
image: {{ test_platforms.first.image }}
flavor: {{ test_platforms.first.flavor}}
commands:
- npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm
- {% if platform.name == "centos" %}DISPLAY=:0 {% endif %}upm-ci project test -u {{ validation_editor }} --type vetting-tests --project-path {{ project.path }} --package-filter {{ package.name }} --platform editmode
artifacts:
logs:
paths:
- "upm-ci~/test-results/**/*"
dependencies:
- .yamato/project-pack.yml#pack_{{ project.name }}
{% endfor -%}
{% endif -%}
{% endfor -%}

# For every platform and editor version, run its project tests without
# running package tests too since they are handled on their respective
# jobs
Expand Down
1 change: 1 addition & 0 deletions .yamato/project.metafile
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,7 @@ projects:
has_tests: true
test_editors:
- 2021.3
- 2022.2
- trunk

# Scripting backends used by Standalone Playmode Tests
Expand Down