Skip to content

[skip ci] [backport] UPM_REGISTRY variable (#6442) #12

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Apr 6, 2020
Merged

[skip ci] [backport] UPM_REGISTRY variable (#6442) #12

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
5 changes: 3 additions & 2 deletions .yamato/upm-ci-abv.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,10 +84,11 @@ smoke_test_{{ testplatform.name }}_{{ editor.version }}:
{% endif %}
image: sdet/gamecode_win10:stable
flavor: b1.large
{% if editor.version == 'CUSTOM-REVISION' %}
variables:
UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates
{% if editor.version == 'CUSTOM-REVISION' %}
CUSTOM_REVISION: custom_revision_not_set
{% endif %}
{% endif %}
commands:
- git clone git@github.cds.internal.unity3d.com:unity/utr.git TestProjects/SRP_SmokeTest/utr
- pip install unity-downloader-cli --extra-index-url https://artifactory.internal.unity3d.com/api/pypi/common-python/simple
Expand Down
15 changes: 9 additions & 6 deletions .yamato/upm-ci-hdrp.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,10 +75,11 @@ linux_apis:
{% endif %}
image: {{ platform.image }}
flavor: {{ platform.flavor }}
{% if editor.version == 'CUSTOM-REVISION' %}
variables:
UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates
{% if editor.version == 'CUSTOM-REVISION' %}
CUSTOM_REVISION: custom_revision_not_set
{% endif %}
{% endif %}
commands:
- git clone git@github.cds.internal.unity3d.com:unity/utr.git TestProjects/{{ project.folder }}/utr
- pip install unity-downloader-cli --extra-index-url https://artifactory.internal.unity3d.com/api/pypi/common-python/simple
Expand Down Expand Up @@ -112,10 +113,11 @@ linux_apis:
type: {{ platform.type }}
image: {{ platform.image }}
flavor: {{ platform.flavor }}
{% if editor.version == 'CUSTOM-REVISION' %}
variables:
UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates
{% if editor.version == 'CUSTOM-REVISION' %}
CUSTOM_REVISION: custom_revision_not_set
{% endif %}
{% endif %}
commands:
- git clone git@github.cds.internal.unity3d.com:unity/utr.git TestProjects/{{ project.folder }}/utr
- ssh -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" bokken@$BOKKEN_DEVICE_IP "bash -lc 'pip3 install --user unity-downloader-cli --extra-index-url https://artifactory.internal.unity3d.com/api/pypi/common-python/simple'"
Expand Down Expand Up @@ -160,10 +162,11 @@ linux_apis:
{% endif %}
image: {{ platform.image }}
flavor: {{ platform.flavor }}
{% if editor.version == 'CUSTOM-REVISION' %}
variables:
UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates
{% if editor.version == 'CUSTOM-REVISION' %}
CUSTOM_REVISION: custom_revision_not_set
{% endif %}
{% endif %}
commands:
- sudo -H pip install --upgrade pip
- sudo -H pip install unity-downloader-cli --extra-index-url https://artifactory.internal.unity3d.com/api/pypi/common-python/simple
Expand Down
2 changes: 2 additions & 0 deletions .yamato/upm-ci-hdrp_dxr.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,8 @@ win_apis:
model: rtx2080
image: {{ platform.image }}
flavor: {{ platform.flavor}}
variables:
UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates
commands:
- git clone git@github.cds.internal.unity3d.com:unity/utr.git TestProjects/{{ project.folder }}/utr
- pip install unity-downloader-cli --extra-index-url https://artifactory.internal.unity3d.com/api/pypi/common-python/simple
Expand Down
20 changes: 12 additions & 8 deletions .yamato/upm-ci-hdrp_standalone.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,10 +54,11 @@ mac_apis:
type: Unity::VM::GPU
image: sdet/gamecode_win10:stable
skip_checkout: true
{% if editor.version == 'CUSTOM-REVISION' %}
variables:
UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates
{% if editor.version == 'CUSTOM-REVISION' %}
CUSTOM_REVISION: custom_revision_not_set
{% endif %}
{% endif %}
commands:
- git clone git@github.cds.internal.unity3d.com:unity/utr.git TestProjects/{{ project.folder }}/utr
- pip install unity-downloader-cli --extra-index-url https://artifactory.internal.unity3d.com/api/pypi/common-python/simple
Expand All @@ -81,10 +82,11 @@ Build_{{ project.name }}_Win_{{ win_api.name }}_Player_{{ editor.version }}:
flavor: b1.xlarge
type: Unity::VM
image: sdet/gamecode_win10:stable
{% if editor.version == 'CUSTOM-REVISION' %}
variables:
UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates
{% if editor.version == 'CUSTOM-REVISION' %}
CUSTOM_REVISION: custom_revision_not_set
{% endif %}
{% endif %}
commands:
- git clone git@github.cds.internal.unity3d.com:unity/utr.git TestProjects/{{ project.folder }}/utr
- pip install unity-downloader-cli --extra-index-url https://artifactory.internal.unity3d.com/api/pypi/common-python/simple
Expand Down Expand Up @@ -115,10 +117,11 @@ Build_{{ project.name }}_Win_{{ win_api.name }}_Player_{{ editor.version }}:
{% endif %}
image: {{ platform.image }}
flavor: {{ platform.flavor }}
{% if editor.version == 'CUSTOM-REVISION' %}
variables:
UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates
{% if editor.version == 'CUSTOM-REVISION' %}
CUSTOM_REVISION: custom_revision_not_set
{% endif %}
{% endif %}
commands:
- git clone git@github.cds.internal.unity3d.com:unity/utr.git TestProjects/{{ project.folder }}/utr
- pip install unity-downloader-cli --extra-index-url https://artifactory.internal.unity3d.com/api/pypi/common-python/simple
Expand Down Expand Up @@ -152,10 +155,11 @@ Build_{{ project.name }}_Win_{{ win_api.name }}_Player_{{ editor.version }}:
type: {{ platform.type }}
image: {{ platform.image }}
flavor: {{ platform.flavor }}
{% if editor.version == 'CUSTOM-REVISION' %}
variables:
UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates
{% if editor.version == 'CUSTOM-REVISION' %}
CUSTOM_REVISION: custom_revision_not_set
{% endif %}
{% endif %}
commands:
- git clone git@github.cds.internal.unity3d.com:unity/utr.git TestProjects/{{ project.folder }}/utr

Expand Down
40 changes: 24 additions & 16 deletions .yamato/upm-ci-shadergraph.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,10 +74,11 @@ mac_apis:
type: Unity::VM::GPU
image: sdet/gamecode_win10:stable
skip_checkout: true
{% if editor.version == 'CUSTOM-REVISION' %}
variables:
UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates
{% if editor.version == 'CUSTOM-REVISION' %}
CUSTOM_REVISION: custom_revision_not_set
{% endif %}
{% endif %}
commands:
- git clone git@github.cds.internal.unity3d.com:unity/utr.git TestProjects/{{ project.folder }}/utr
- pip install unity-downloader-cli --extra-index-url https://artifactory.internal.unity3d.com/api/pypi/common-python/simple
Expand All @@ -101,10 +102,11 @@ Build_{{ project.name }}_Win_{{ win_api.name }}_Player_{{ editor.version }}:
flavor: b1.xlarge
type: Unity::VM
image: sdet/gamecode_win10:stable
{% if editor.version == 'CUSTOM-REVISION' %}
variables:
UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates
{% if editor.version == 'CUSTOM-REVISION' %}
CUSTOM_REVISION: custom_revision_not_set
{% endif %}
{% endif %}
commands:
- git clone git@github.cds.internal.unity3d.com:unity/utr.git TestProjects/{{ project.folder }}/utr
- pip install unity-downloader-cli --extra-index-url https://artifactory.internal.unity3d.com/api/pypi/common-python/simple
Expand Down Expand Up @@ -135,10 +137,11 @@ Build_{{ project.name }}_Win_{{ win_api.name }}_Player_{{ editor.version }}:
{% endif %}
image: {{ platform.image }}
flavor: {{ platform.flavor }}
{% if editor.version == 'CUSTOM-REVISION' %}
variables:
UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates
{% if editor.version == 'CUSTOM-REVISION' %}
CUSTOM_REVISION: custom_revision_not_set
{% endif %}
{% endif %}
commands:
- git clone git@github.cds.internal.unity3d.com:unity/utr.git TestProjects/{{ project.folder }}/utr
- pip install unity-downloader-cli --extra-index-url https://artifactory.internal.unity3d.com/api/pypi/common-python/simple
Expand Down Expand Up @@ -170,10 +173,11 @@ Build_{{ project.name }}_OSX_OpenGLCore_Player_{{ editor.version }}:
type: {{ platform.type }}
image: {{ platform.image }}
flavor: {{ platform.flavor }}
{% if editor.version == 'CUSTOM-REVISION' %}
variables:
UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates
{% if editor.version == 'CUSTOM-REVISION' %}
CUSTOM_REVISION: custom_revision_not_set
{% endif %}
{% endif %}
commands:
- git clone git@github.cds.internal.unity3d.com:unity/utr.git TestProjects/{{ project.folder }}/utr
- pip install unity-downloader-cli --extra-index-url https://artifactory.internal.unity3d.com/api/pypi/common-python/simple
Expand All @@ -199,10 +203,11 @@ Build_{{ project.name }}_OSX_OpenGLCore_Player_{{ editor.version }}:
image: buildfarm/mac:stable
flavor: m1.mac
skip_checkout: true
{% if editor.version == 'CUSTOM-REVISION' %}
variables:
UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates
{% if editor.version == 'CUSTOM-REVISION' %}
CUSTOM_REVISION: custom_revision_not_set
{% endif %}
{% endif %}
commands:
- git clone git@github.cds.internal.unity3d.com:unity/utr.git TestProjects/{{ project.folder }}/utr
- pip install unity-downloader-cli --extra-index-url https://artifactory.internal.unity3d.com/api/pypi/common-python/simple
Expand All @@ -227,10 +232,11 @@ Build_{{ project.name }}_OSX_OpenGLCore_Player_{{ editor.version }}:
type: Unity::VM::osx
image: buildfarm/mac:stable
flavor: m1.mac
{% if editor.version == 'CUSTOM-REVISION' %}
variables:
UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates
{% if editor.version == 'CUSTOM-REVISION' %}
CUSTOM_REVISION: custom_revision_not_set
{% endif %}
{% endif %}
commands:
- git clone git@github.cds.internal.unity3d.com:unity/utr.git TestProjects/{{ project.folder }}/utr
- pip install unity-downloader-cli --extra-index-url https://artifactory.internal.unity3d.com/api/pypi/common-python/simple
Expand Down Expand Up @@ -267,10 +273,11 @@ Build_{{ project.name }}_OSX_OpenGLCore_Player_{{ editor.version }}:
type: {{ platform.type }}
image: {{ platform.image }}
flavor: {{ platform.flavor }}
{% if editor.version == 'CUSTOM-REVISION' %}
variables:
UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates
{% if editor.version == 'CUSTOM-REVISION' %}
CUSTOM_REVISION: custom_revision_not_set
{% endif %}
{% endif %}
commands:
- git clone git@github.cds.internal.unity3d.com:unity/utr.git TestProjects/{{ project.folder }}/utr

Expand Down Expand Up @@ -316,10 +323,11 @@ Build_{{ project.name }}_OSX_OpenGLCore_Player_{{ editor.version }}:
{% endif %}
image: {{ platform.image }}
flavor: {{ platform.flavor }}
{% if editor.version == 'CUSTOM-REVISION' %}
variables:
UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates
{% if editor.version == 'CUSTOM-REVISION' %}
CUSTOM_REVISION: custom_revision_not_set
{% endif %}
{% endif %}
commands:
- sudo -H pip install --upgrade pip
- sudo -H pip install unity-downloader-cli --extra-index-url https://artifactory.internal.unity3d.com/api/pypi/common-python/simple
Expand Down
45 changes: 27 additions & 18 deletions .yamato/upm-ci-universal.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,10 +84,11 @@ mac_apis:
type: Unity::VM::GPU
image: sdet/gamecode_win10:stable
skip_checkout: true
{% if editor.version == 'CUSTOM-REVISION' %}
variables:
UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates
{% if editor.version == 'CUSTOM-REVISION' %}
CUSTOM_REVISION: custom_revision_not_set
{% endif %}
{% endif %}
commands:
- git clone git@github.cds.internal.unity3d.com:unity/utr.git TestProjects/{{ project.folder }}/utr
- pip install unity-downloader-cli --extra-index-url https://artifactory.internal.unity3d.com/api/pypi/common-python/simple
Expand All @@ -111,10 +112,11 @@ Build_{{ project.name }}_Win_{{ win_api.name }}_Player_{{ editor.version }}:
flavor: b1.xlarge
type: Unity::VM
image: sdet/gamecode_win10:stable
{% if editor.version == 'CUSTOM-REVISION' %}
variables:
UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates
{% if editor.version == 'CUSTOM-REVISION' %}
CUSTOM_REVISION: custom_revision_not_set
{% endif %}
{% endif %}
commands:
- git clone git@github.cds.internal.unity3d.com:unity/utr.git TestProjects/{{ project.folder }}/utr
- pip install unity-downloader-cli --extra-index-url https://artifactory.internal.unity3d.com/api/pypi/common-python/simple
Expand Down Expand Up @@ -145,10 +147,11 @@ Build_{{ project.name }}_Win_{{ win_api.name }}_Player_{{ editor.version }}:
{% endif %}
image: {{ platform.image }}
flavor: {{ platform.flavor }}
{% if editor.version == 'CUSTOM-REVISION' %}
variables:
UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates
{% if editor.version == 'CUSTOM-REVISION' %}
CUSTOM_REVISION: custom_revision_not_set
{% endif %}
{% endif %}
commands:
- git clone git@github.cds.internal.unity3d.com:unity/utr.git TestProjects/{{ project.folder }}/utr
- pip install unity-downloader-cli --extra-index-url https://artifactory.internal.unity3d.com/api/pypi/common-python/simple
Expand Down Expand Up @@ -180,10 +183,11 @@ Build_{{ project.name }}_OSX_OpenGLCore_Player_{{ editor.version }}:
type: {{ platform.type }}
image: {{ platform.image }}
flavor: {{ platform.flavor }}
{% if editor.version == 'CUSTOM-REVISION' %}
variables:
UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates
{% if editor.version == 'CUSTOM-REVISION' %}
CUSTOM_REVISION: custom_revision_not_set
{% endif %}
{% endif %}
commands:
- git clone git@github.cds.internal.unity3d.com:unity/utr.git TestProjects/{{ project.folder }}/utr
- pip install unity-downloader-cli --extra-index-url https://artifactory.internal.unity3d.com/api/pypi/common-python/simple
Expand All @@ -209,10 +213,11 @@ Build_{{ project.name }}_OSX_OpenGLCore_Player_{{ editor.version }}:
image: buildfarm/mac:stable
flavor: m1.mac
skip_checkout: true
{% if editor.version == 'CUSTOM-REVISION' %}
variables:
UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates
{% if editor.version == 'CUSTOM-REVISION' %}
CUSTOM_REVISION: custom_revision_not_set
{% endif %}
{% endif %}
commands:
- git clone git@github.cds.internal.unity3d.com:unity/utr.git TestProjects/{{ project.folder }}/utr
- pip install unity-downloader-cli --extra-index-url https://artifactory.internal.unity3d.com/api/pypi/common-python/simple
Expand All @@ -237,10 +242,11 @@ Build_{{ project.name }}_OSX_OpenGLCore_Player_{{ editor.version }}:
type: Unity::VM::osx
image: buildfarm/mac:stable
flavor: m1.mac
{% if editor.version == 'CUSTOM-REVISION' %}
variables:
UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates
{% if editor.version == 'CUSTOM-REVISION' %}
CUSTOM_REVISION: custom_revision_not_set
{% endif %}
{% endif %}
commands:
- git clone git@github.cds.internal.unity3d.com:unity/utr.git TestProjects/{{ project.folder }}/utr
- pip install unity-downloader-cli --extra-index-url https://artifactory.internal.unity3d.com/api/pypi/common-python/simple
Expand Down Expand Up @@ -277,10 +283,11 @@ Build_{{ project.name }}_OSX_OpenGLCore_Player_{{ editor.version }}:
type: {{ platform.type }}
image: {{ platform.image }}
flavor: {{ platform.flavor }}
{% if editor.version == 'CUSTOM-REVISION' %}
variables:
UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates
{% if editor.version == 'CUSTOM-REVISION' %}
CUSTOM_REVISION: custom_revision_not_set
{% endif %}
{% endif %}
commands:
- git clone git@github.cds.internal.unity3d.com:unity/utr.git TestProjects/{{ project.folder }}/utr

Expand Down Expand Up @@ -328,10 +335,11 @@ Build_{{ project.name }}_OSX_OpenGLCore_Player_{{ editor.version }}:
{% endif %}
image: {{ platform.image }}
flavor: {{ platform.flavor }}
{% if editor.version == 'CUSTOM-REVISION' %}
variables:
UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates
{% if editor.version == 'CUSTOM-REVISION' %}
CUSTOM_REVISION: custom_revision_not_set
{% endif %}
{% endif %}
commands:
- sudo -H pip install --upgrade pip
- sudo -H pip install unity-downloader-cli --extra-index-url https://artifactory.internal.unity3d.com/api/pypi/common-python/simple
Expand Down Expand Up @@ -364,10 +372,11 @@ Build_{{ project.name }}_OSX_OpenGLCore_Player_{{ editor.version }}:
type: {{ platform.type }}
image: {{ platform.image }}
flavor: {{ platform.flavor }}
{% if editor.version == 'CUSTOM-REVISION' %}
variables:
UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates
{% if editor.version == 'CUSTOM-REVISION' %}
CUSTOM_REVISION: custom_revision_not_set
{% endif %}
{% endif %}
commands:
- wget http://artifactory-slo.bf.unity3d.com/artifactory/ie-generic-core-automation/tools/android/shield/adbkey.pub -O %USERPROFILE%/.android/adbkey.pub
- wget http://artifactory-slo.bf.unity3d.com/artifactory/ie-generic-core-automation/tools/android/shield/adbkey -O %USERPROFILE%/.android/adbkey
Expand Down
Loading