From 419948658585f2dd301dedc17e0df0a60a25ede6 Mon Sep 17 00:00:00 2001 From: Sourcegraph Date: Thu, 4 Apr 2024 17:42:54 +0000 Subject: [PATCH] Use slough artifactory in CI Part 2 --- .yamato/mobile-build-and-test.yml | 8 ++++---- .yamato/multiprocess-project-tests.yml | 2 +- .yamato/standalone-project-tests.yml | 2 +- .yamato/webgl-build.yml | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.yamato/mobile-build-and-test.yml b/.yamato/mobile-build-and-test.yml index b3d16e097b..9fbf0f92d1 100644 --- a/.yamato/mobile-build-and-test.yml +++ b/.yamato/mobile-build-and-test.yml @@ -12,7 +12,7 @@ build_{{ project.name }}_tests_{{ editor }}_android: flavor: b1.xlarge commands: - pip install unity-downloader-cli --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple - - curl -s https://artifactory.prd.it.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr.bat --output utr.bat + - curl -s https://artifactory-slo.bf.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr.bat --output utr.bat - python .yamato/disable-burst-if-requested.py --project-path testproject --platform Android - unity-downloader-cli -u {{ editor }} -c editor -c Android -w --fast - | @@ -51,7 +51,7 @@ build_{{ project.name }}_tests_{{ editor }}_iOS: commands: - pip install unity-downloader-cli --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple - unity-downloader-cli -u {{ editor }} -c editor -c iOS -w --fast - - curl -s https://artifactory.prd.it.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr --output utr + - curl -s https://artifactory-slo.bf.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr --output utr - chmod +x ./utr - export UTR_VERSION=0.12.0 - ./utr --artifacts_path=artifacts --timeout=1800 --testproject={{ project.name }} --editor-location=.Editor --suite=playmode --platform=iOS --build-only --player-save-path=build/players --extra-editor-arg=-batchmode --extra-editor-arg=-nographics --testfilter=Unity.Netcode.RuntimeTests @@ -88,7 +88,7 @@ run_{{ project.name }}_tests_{{ editor }}_iOS: - .yamato/mobile-build-and-test.yml#build_{{ project.name }}_tests_{{ editor }}_iOS commands: # Download standalone UnityTestRunner - - curl -s https://artifactory.prd.it.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr --output utr + - curl -s https://artifactory-slo.bf.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr --output utr # Give UTR execution permissions - chmod +x ./utr # Run the test build on the device @@ -127,7 +127,7 @@ run_{{ project.name }}_tests_{{ editor }}_android: dependencies: - .yamato/mobile-build-and-test.yml#build_{{ project.name }}_tests_{{ editor }}_android commands: - - curl -s https://artifactory.prd.it.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr.bat --output utr.bat + - curl -s https://artifactory-slo.bf.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr.bat --output utr.bat - | set ANDROID_DEVICE_CONNECTION=%BOKKEN_DEVICE_IP% start %ANDROID_SDK_ROOT%\platform-tools\adb.exe connect %BOKKEN_DEVICE_IP% diff --git a/.yamato/multiprocess-project-tests.yml b/.yamato/multiprocess-project-tests.yml index 3505d72c52..3f3dab5787 100644 --- a/.yamato/multiprocess-project-tests.yml +++ b/.yamato/multiprocess-project-tests.yml @@ -15,7 +15,7 @@ singlenode_multiprocess_test_testproject_{{ editor }}_{{ platform.name }}: - pip install unity-downloader-cli --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple {% if editor != "trunk" %} - unity-downloader-cli -u {{ editor }} -c editor -w --fast - - curl -s https://artifactory.prd.it.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr{% if platform.name == "win" %}.bat --output utr.bat{% endif %}{% if platform.name != "win" %} --output utr && chmod +x ./utr{% endif %} + - curl -s https://artifactory-slo.bf.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr{% if platform.name == "win" %}.bat --output utr.bat{% endif %}{% if platform.name != "win" %} --output utr && chmod +x ./utr{% endif %} - {{ platform.editorpath }} -projectpath testproject -batchmode -quit -nographics -logfile BuildMultiprocessTestPlayer.log -executeMethod Unity.Netcode.MultiprocessRuntimeTests.BuildMultiprocessTestPlayer.BuildRelease {% if platform.name == "mac" %} - sudo codesign --force --deep --sign - ./testproject/Builds/MultiprocessTests/MultiprocessTestPlayer.app{% endif %} - {{ platform.utr }} --suite=playmode --testproject=testproject --editor-location=.Editor --testfilter=Unity.Netcode.MultiprocessRuntimeTests --extra-editor-arg=-bypassIgnoreUTR diff --git a/.yamato/standalone-project-tests.yml b/.yamato/standalone-project-tests.yml index abaefc753f..8743b5fb97 100644 --- a/.yamato/standalone-project-tests.yml +++ b/.yamato/standalone-project-tests.yml @@ -16,7 +16,7 @@ standalone_tests_{{ project.name }}_{{ backend }}_{{ editor }}_{{ platform.name commands: - 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 --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple - - curl -s https://artifactory.prd.it.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr{% if platform.name == "win" %}.bat{% endif %} --output utr{% if platform.name == "win" %}.bat{% endif %} + - curl -s https://artifactory-slo.bf.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr{% if platform.name == "win" %}.bat{% endif %} --output utr{% if platform.name == "win" %}.bat{% endif %} {% if platform.name != "win" %} - chmod +x ./utr {% endif %} diff --git a/.yamato/webgl-build.yml b/.yamato/webgl-build.yml index 2a01a934b7..73fffbf790 100644 --- a/.yamato/webgl-build.yml +++ b/.yamato/webgl-build.yml @@ -12,7 +12,7 @@ build_{{ project.name }}_tests_{{ editor }}_webgl: flavor: b1.xlarge commands: - pip install unity-downloader-cli --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple - - curl -s https://artifactory.prd.it.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr.bat --output utr.bat + - curl -s https://artifactory-slo.bf.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr.bat --output utr.bat - python .yamato/disable-burst-if-requested.py --project-path testproject --platform WebGL - unity-downloader-cli -u {{ editor }} -c editor -c webgl -c il2cpp -w --fast - |