Skip to content

Commit 08b0f42

Browse files
committed
modified package pack job to just use ubuntu
1 parent 128c1a0 commit 08b0f42

File tree

1 file changed

+5
-10
lines changed

1 file changed

+5
-10
lines changed

.yamato/package-pack.yml

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -23,16 +23,12 @@
2323

2424
#------------------------------------------------------------------------------------
2525

26-
{% for platform in test_platforms.desktop -%}
26+
# Note that a package pack job on ubuntu will return the same tarball as windows or macOS based job
27+
# It may be confusing that a mac package test job depends on ubuntu pack, but it simplifies the configuration so this comment should help clarifying
28+
# This also reduces overhead since there is no point of running essentially 2 same jobs
2729
package_pack_-_ngo_{{ platform.name }}:
2830
name: Package Pack (and x-ray) - NGO [{{ platform.name }}]
29-
agent:
30-
type: {{ platform.type }}
31-
image: {{ platform.image }}
32-
flavor: {{ platform.flavor }}
33-
{% if platform.model %}
34-
model: {{ platform.model }} # This is set only in platforms where we want non-default model to use (more information in project.metafile)
35-
{% endif %}
31+
agent: { type: Unity::VM, flavor: b1.small, image: package-ci/ubuntu-22.04:v4 }
3632
timeout: 0.25
3733
variables:
3834
XRAY_PROFILE: "supported ./pvpExceptions.json"
@@ -43,12 +39,11 @@ package_pack_-_ngo_{{ platform.name }}:
4339

4440
- upm-pvp pack "com.unity.netcode.gameobjects" --output upm-ci~/packages
4541
- upm-pvp xray --packages "upm-ci~/packages/com.unity.netcode.gameobjects*.tgz" --results pvp-results
46-
- upm-pvp require {% if platform.name == "win" %}"%XRAY_PROFILE%"{% else %}"$XRAY_PROFILE"{% endif %} --results pvp-results --allow-missing
42+
- upm-pvp require "$XRAY_PROFILE" --results pvp-results --allow-missing
4743
artifacts:
4844
logs:
4945
paths:
5046
- "pvp-results/*"
5147
packages:
5248
paths:
5349
- "upm-ci~/**"
54-
{% endfor -%}

0 commit comments

Comments
 (0)