From 303ca8649ed726623c935ea7fa17f512a0dfd3f4 Mon Sep 17 00:00:00 2001 From: Sophia Date: Tue, 21 Apr 2020 15:20:05 +0200 Subject: [PATCH] change registry --- .yamato/upm-ci-hdrp.yml | 1 - .yamato/upm-ci-packages.yml | 10 +++++----- .yamato/upm-ci-shadergraph.yml | 1 - .yamato/upm-ci-templates.yml | 8 ++++---- .yamato/upm-ci-universal.yml | 1 - .yamato/upm-ci-vfx_lwrp.yml | 1 - .yamato/upm-ci-vfxmain.yml | 1 - .yamato/z_preview-publish.yml | 6 +++--- 8 files changed, 12 insertions(+), 17 deletions(-) diff --git a/.yamato/upm-ci-hdrp.yml b/.yamato/upm-ci-hdrp.yml index d88ac41b401..a5b3dcfc436 100644 --- a/.yamato/upm-ci-hdrp.yml +++ b/.yamato/upm-ci-hdrp.yml @@ -174,7 +174,6 @@ linux_apis: 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 --upgrade - - sudo npm install upm-ci-utils -g --registry https://api.bintray.com/npm/unity/unity-npm - git clone git@github.cds.internal.unity3d.com:unity/utr.git TestProjects/{{ project.folder }}/utr - cd TestProjects/{{ project.folder }} && sudo unity-downloader-cli --source-file ../../unity_revision.txt {% for component in platform.components %}-c {{ component }} {% endfor %}--wait --published-only diff --git a/.yamato/upm-ci-packages.yml b/.yamato/upm-ci-packages.yml index 7cb29bdbe5b..712849d5930 100644 --- a/.yamato/upm-ci-packages.yml +++ b/.yamato/upm-ci-packages.yml @@ -91,7 +91,7 @@ pack_{{ package.id }}: image: package-ci/win10:stable flavor: b1.large commands: - - npm install upm-ci-utils@stable -g --registry https://api.bintray.com/npm/unity/unity-npm + - npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm - upm-ci package pack --package-path {{ package.packagename }} artifacts: packages: @@ -109,7 +109,7 @@ test_{{ package.id }}_{{ platform.name }}_{{ editor.version }}: image: {{ platform.agent.image }} flavor: {{ platform.agent.flavor }} commands: - - npm install upm-ci-utils@stable -g --registry https://api.bintray.com/npm/unity/unity-npm + - npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm - pip install unity-downloader-cli --extra-index-url https://artifactory.internal.unity3d.com/api/pypi/common-python/simple --upgrade - unity-downloader-cli --source-file unity_revision.txt -c editor --wait --published-only {% if package.hascodependencies %} @@ -139,7 +139,7 @@ test_{{ package.id }}_{{ platform.name }}_{{ editor.version }}_dependencies: image: {{ platform.agent.image }} flavor: {{ platform.agent.flavor }} commands: - - npm install upm-ci-utils@stable -g --registry https://api.bintray.com/npm/unity/unity-npm + - npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm - pip install unity-downloader-cli --extra-index-url https://artifactory.internal.unity3d.com/api/pypi/common-python/simple --upgrade - unity-downloader-cli --source-file unity_revision.txt -c editor --wait --published-only {% if package.hascodependencies %} @@ -168,7 +168,7 @@ all_package_ci_{{ editor.version }}: image: package-ci/win10:stable flavor: b1.large commands: - - npm install upm-ci-utils@stable -g --registry https://api.bintray.com/npm/unity/unity-npm + - npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm - upm-ci package izon -t - upm-ci package izon -d dependencies: @@ -189,7 +189,7 @@ publish_{{ package.id }}: image: package-ci/win10:stable flavor: b1.large commands: - - npm install upm-ci-utils@stable -g --registry https://api.bintray.com/npm/unity/unity-npm + - npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm - upm-ci package publish --package-path {{ package.packagename }} artifacts: packages: diff --git a/.yamato/upm-ci-shadergraph.yml b/.yamato/upm-ci-shadergraph.yml index 9c1fb41bce9..9e39cdb2807 100644 --- a/.yamato/upm-ci-shadergraph.yml +++ b/.yamato/upm-ci-shadergraph.yml @@ -340,7 +340,6 @@ Build_{{ project.name }}_OSX_OpenGLCore_Player_{{ editor.version }}: 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 --upgrade - - sudo npm install upm-ci-utils -g --registry https://api.bintray.com/npm/unity/unity-npm - git clone git@github.cds.internal.unity3d.com:unity/utr.git TestProjects/{{ project.folder }}/utr - cd TestProjects/{{ project.folder }} && sudo unity-downloader-cli --source-file ../../unity_revision.txt {% for component in platform.components %}-c {{ component }} {% endfor %}--wait --published-only diff --git a/.yamato/upm-ci-templates.yml b/.yamato/upm-ci-templates.yml index 708f7133cd3..7028f6fd5ee 100644 --- a/.yamato/upm-ci-templates.yml +++ b/.yamato/upm-ci-templates.yml @@ -54,7 +54,7 @@ pack_{{ template.id }}: image: package-ci/win10:stable flavor: b1.large commands: - - npm install upm-ci-utils@stable -g --registry https://api.bintray.com/npm/unity/unity-npm + - npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm - upm-ci template pack --project-path {{ template.packagename }} artifacts: packages: @@ -73,7 +73,7 @@ test_{{ template.id }}_{{ platform.name }}_{{ editor.version }}: image: {{ platform.agent.image }} flavor: {{ platform.agent.flavor }} commands: - - npm install upm-ci-utils@stable -g --registry https://api.bintray.com/npm/unity/unity-npm + - npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm - pip install unity-downloader-cli --extra-index-url https://artifactory.internal.unity3d.com/api/pypi/common-python/simple --upgrade - unity-downloader-cli --source-file unity_revision.txt -c editor --wait --published-only {% if template.hascodependencies %} @@ -104,7 +104,7 @@ test_{{ template.id }}_{{ platform.name }}_{{ editor.version }}_dependencies: image: {{ platform.agent.image }} flavor: {{ platform.agent.flavor }} commands: - - npm install upm-ci-utils@stable -g --registry https://api.bintray.com/npm/unity/unity-npm + - npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm - pip install unity-downloader-cli --extra-index-url https://artifactory.internal.unity3d.com/api/pypi/common-python/simple --upgrade - unity-downloader-cli --source-file unity_revision.txt -c editor --wait --published-only {% if template.hascodependencies %} @@ -133,7 +133,7 @@ all_template_ci_{{ editor.version }}: image: package-ci/win10:stable flavor: b1.large commands: - - npm install upm-ci-utils@stable -g --registry https://api.bintray.com/npm/unity/unity-npm + - npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm - upm-ci package izon -t - upm-ci package izon -d dependencies: diff --git a/.yamato/upm-ci-universal.yml b/.yamato/upm-ci-universal.yml index 0f4a54f53a6..196b7a852c6 100644 --- a/.yamato/upm-ci-universal.yml +++ b/.yamato/upm-ci-universal.yml @@ -354,7 +354,6 @@ Build_{{ project.name }}_OSX_OpenGLCore_Player_{{ editor.version }}: 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 --upgrade - - sudo npm install upm-ci-utils -g --registry https://api.bintray.com/npm/unity/unity-npm - git clone git@github.cds.internal.unity3d.com:unity/utr.git TestProjects/{{ project.folder }}/utr - cd TestProjects/{{ project.folder }} && sudo unity-downloader-cli --source-file ../../unity_revision.txt {% for component in platform.components %}-c {{ component }} {% endfor %}--wait --published-only diff --git a/.yamato/upm-ci-vfx_lwrp.yml b/.yamato/upm-ci-vfx_lwrp.yml index 67458cdc7cf..e5018412651 100644 --- a/.yamato/upm-ci-vfx_lwrp.yml +++ b/.yamato/upm-ci-vfx_lwrp.yml @@ -337,7 +337,6 @@ Build_{{ project.name }}_OSX_OpenGLCore_Player_{{ editor.version }}: 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 --upgrade - - sudo npm install upm-ci-utils -g --registry https://api.bintray.com/npm/unity/unity-npm - git clone git@github.cds.internal.unity3d.com:unity/utr.git TestProjects/{{ project.folder }}/utr - cd TestProjects/{{ project.folder }} && sudo unity-downloader-cli --source-file ../../unity_revision.txt {% for component in platform.components %}-c {{ component }} {% endfor %}--wait --published-only diff --git a/.yamato/upm-ci-vfxmain.yml b/.yamato/upm-ci-vfxmain.yml index 57a41d00494..cd30897631c 100644 --- a/.yamato/upm-ci-vfxmain.yml +++ b/.yamato/upm-ci-vfxmain.yml @@ -230,7 +230,6 @@ Build_{{ project.name }}_Win_{{ win_api.name }}_Player_{{ editor.version }}: 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 --upgrade - - sudo npm install upm-ci-utils -g --registry https://api.bintray.com/npm/unity/unity-npm - git clone git@github.cds.internal.unity3d.com:unity/utr.git TestProjects/{{ project.folder }}/utr - cd TestProjects/{{ project.folder }} && sudo unity-downloader-cli --source-file ../../unity_revision.txt {% for component in platform.components %}-c {{ component }} {% endfor %}--wait --published-only diff --git a/.yamato/z_preview-publish.yml b/.yamato/z_preview-publish.yml index eb104544293..eb462bb9efe 100644 --- a/.yamato/z_preview-publish.yml +++ b/.yamato/z_preview-publish.yml @@ -32,7 +32,7 @@ auto-version: {{ v[0] }}: {{ v[1]}} {% endfor -%} commands: - - npm install upm-ci-utils@stable -g --registry https://api.bintray.com/npm/unity/unity-npm + - npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm - > upm-ci utils auto-version bump {% for test in testables -%} @@ -64,7 +64,7 @@ publish_{{ test.name }}: {{ v[0] }}: {{ v[1]}} {% endfor %} commands: - - npm install upm-ci-utils@stable -g --registry https://api.bintray.com/npm/unity/unity-npm + - npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm - > upm-ci {{ test.type }} publish --{{ test.type }}-path {{ test.path }} @@ -111,7 +111,7 @@ promote_{{ test.name }}: variables: UPMCI_PROMOTION: 1 commands: - - npm install upm-ci-utils@stable -g --registry https://api.bintray.com/npm/unity/unity-npm + - npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm - > upm-ci {{ test.type }} promote --{{ test.type }}-path {{ test.path }}