From 0be59ad920bf5d880fc20358764298b881d49311 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Th=C3=A9o=20Penavaire?= Date: Tue, 7 Sep 2021 15:43:53 +0200 Subject: [PATCH 01/14] Ask mercurial to reformat on commit --- .yamato/_copycat.yml | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/.yamato/_copycat.yml b/.yamato/_copycat.yml index 60984df9ada..dee2f8212f7 100644 --- a/.yamato/_copycat.yml +++ b/.yamato/_copycat.yml @@ -12,10 +12,12 @@ nightly_katana_abv_validate: SRP_VERSION: "11.0.0" skip_checkout: true commands: + - echo "[hgunity]" >> $HOME/.hgrc # These 2 lines ask mercurial to run the oncommit formatting hook + - echo "format.oncommit=yes" >> $HOME/.hgrc - eval "$COPYCAT_1" - copycat vendor --revision "${GIT_TAG:-${GIT_BRANCH%%' (tag)'}}" --sha "$GIT_REVISION" "../destination/$MANIFEST" - - git clone git@github.cds.internal.unity3d.com:unity/gfx-sdet-tools.git ../gfx-sdet-tools - - python3 ../gfx-sdet-tools/scripts/srp_test_references_updater.py --srp-version $SRP_VERSION --destination-folder ../destination + - git clone git@github.cds.internal.unity3d.com:unity/gfx-sdet-tools.git ../gfx-sdet-tools # Needed for next step + - python3 ../gfx-sdet-tools/scripts/srp_test_references_updater.py --srp-version $SRP_VERSION --destination-folder ../destination # Updates the test project references because packages are not located at the same relative path in and - copycat katana "../destination/$MANIFEST" triggers: recurring: @@ -34,11 +36,13 @@ vendor: SRP_VERSION: "11.0.0" skip_checkout: true commands: + - echo "[hgunity]" >> $HOME/.hgrc + - echo "format.oncommit=yes" >> $HOME/.hgrc - eval "$COPYCAT_1" - git clone git@github.cds.internal.unity3d.com:unity/gfx-sdet-tools.git ../gfx-sdet-tools - copycat diff -o ../diff.patch "../destination/$MANIFEST" - copycat vendor --revision "${GIT_TAG:-${GIT_BRANCH%%' (tag)'}}" --sha "$GIT_REVISION" "../destination/$MANIFEST" - - | + - | # Generates Ono PR ready release notes from the graphics changelogs changes included in the vendoring. Following line is shell syntax for stripping the @unity3d.com part of email address to only get the author handle author=${YAMATO_OWNER_EMAIL%@unity3d.com} python3 ../gfx-sdet-tools/scripts/gfx_to_ono_changelog_converter.py --author "$author" --unity-target-branch "$RELEASE_BRANCH" - python3 ../gfx-sdet-tools/scripts/srp_test_references_updater.py --srp-version $SRP_VERSION --destination-folder ../destination From 2ded9367e6cf573da376a8a79b1128109e79b4c9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Th=C3=A9o=20Penavaire?= Date: Mon, 27 Sep 2021 17:25:43 +0200 Subject: [PATCH 02/14] Move config update after hg install to avoid override --- .yamato/_copycat.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.yamato/_copycat.yml b/.yamato/_copycat.yml index dee2f8212f7..7fb908b3eb8 100644 --- a/.yamato/_copycat.yml +++ b/.yamato/_copycat.yml @@ -12,9 +12,9 @@ nightly_katana_abv_validate: SRP_VERSION: "11.0.0" skip_checkout: true commands: + - eval "$COPYCAT_1" - echo "[hgunity]" >> $HOME/.hgrc # These 2 lines ask mercurial to run the oncommit formatting hook - echo "format.oncommit=yes" >> $HOME/.hgrc - - eval "$COPYCAT_1" - copycat vendor --revision "${GIT_TAG:-${GIT_BRANCH%%' (tag)'}}" --sha "$GIT_REVISION" "../destination/$MANIFEST" - git clone git@github.cds.internal.unity3d.com:unity/gfx-sdet-tools.git ../gfx-sdet-tools # Needed for next step - python3 ../gfx-sdet-tools/scripts/srp_test_references_updater.py --srp-version $SRP_VERSION --destination-folder ../destination # Updates the test project references because packages are not located at the same relative path in and @@ -36,9 +36,9 @@ vendor: SRP_VERSION: "11.0.0" skip_checkout: true commands: + - eval "$COPYCAT_1" - echo "[hgunity]" >> $HOME/.hgrc - echo "format.oncommit=yes" >> $HOME/.hgrc - - eval "$COPYCAT_1" - git clone git@github.cds.internal.unity3d.com:unity/gfx-sdet-tools.git ../gfx-sdet-tools - copycat diff -o ../diff.patch "../destination/$MANIFEST" - copycat vendor --revision "${GIT_TAG:-${GIT_BRANCH%%' (tag)'}}" --sha "$GIT_REVISION" "../destination/$MANIFEST" From 29a291bfe6ea08f787282352817264b94f5923fe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Th=C3=A9o=20Penavaire?= Date: Mon, 27 Sep 2021 18:03:00 +0200 Subject: [PATCH 03/14] Update copycat pipelines --- .yamato/_copycat.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.yamato/_copycat.yml b/.yamato/_copycat.yml index 7fb908b3eb8..96dac49bbb4 100644 --- a/.yamato/_copycat.yml +++ b/.yamato/_copycat.yml @@ -15,8 +15,9 @@ nightly_katana_abv_validate: - eval "$COPYCAT_1" - echo "[hgunity]" >> $HOME/.hgrc # These 2 lines ask mercurial to run the oncommit formatting hook - echo "format.oncommit=yes" >> $HOME/.hgrc + - git clone git@github.cds.internal.unity3d.com:unity/gfx-sdet-tools.git ../gfx-sdet-tools + - pip install unidiff - copycat vendor --revision "${GIT_TAG:-${GIT_BRANCH%%' (tag)'}}" --sha "$GIT_REVISION" "../destination/$MANIFEST" - - git clone git@github.cds.internal.unity3d.com:unity/gfx-sdet-tools.git ../gfx-sdet-tools # Needed for next step - python3 ../gfx-sdet-tools/scripts/srp_test_references_updater.py --srp-version $SRP_VERSION --destination-folder ../destination # Updates the test project references because packages are not located at the same relative path in and - copycat katana "../destination/$MANIFEST" triggers: @@ -40,6 +41,7 @@ vendor: - echo "[hgunity]" >> $HOME/.hgrc - echo "format.oncommit=yes" >> $HOME/.hgrc - git clone git@github.cds.internal.unity3d.com:unity/gfx-sdet-tools.git ../gfx-sdet-tools + - pip install unidiff - copycat diff -o ../diff.patch "../destination/$MANIFEST" - copycat vendor --revision "${GIT_TAG:-${GIT_BRANCH%%' (tag)'}}" --sha "$GIT_REVISION" "../destination/$MANIFEST" - | # Generates Ono PR ready release notes from the graphics changelogs changes included in the vendoring. Following line is shell syntax for stripping the @unity3d.com part of email address to only get the author handle From 714cf6400bd25d9d655610d94c459515ebfdc7b8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Th=C3=A9o=20Penavaire?= Date: Tue, 28 Sep 2021 10:12:57 +0200 Subject: [PATCH 04/14] Use pip3 --- .yamato/_copycat.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.yamato/_copycat.yml b/.yamato/_copycat.yml index 96dac49bbb4..2e02eeb91c8 100644 --- a/.yamato/_copycat.yml +++ b/.yamato/_copycat.yml @@ -16,7 +16,7 @@ nightly_katana_abv_validate: - echo "[hgunity]" >> $HOME/.hgrc # These 2 lines ask mercurial to run the oncommit formatting hook - echo "format.oncommit=yes" >> $HOME/.hgrc - git clone git@github.cds.internal.unity3d.com:unity/gfx-sdet-tools.git ../gfx-sdet-tools - - pip install unidiff + - pip3 install unidiff - copycat vendor --revision "${GIT_TAG:-${GIT_BRANCH%%' (tag)'}}" --sha "$GIT_REVISION" "../destination/$MANIFEST" - python3 ../gfx-sdet-tools/scripts/srp_test_references_updater.py --srp-version $SRP_VERSION --destination-folder ../destination # Updates the test project references because packages are not located at the same relative path in and - copycat katana "../destination/$MANIFEST" @@ -41,7 +41,7 @@ vendor: - echo "[hgunity]" >> $HOME/.hgrc - echo "format.oncommit=yes" >> $HOME/.hgrc - git clone git@github.cds.internal.unity3d.com:unity/gfx-sdet-tools.git ../gfx-sdet-tools - - pip install unidiff + - pip3 install unidiff - copycat diff -o ../diff.patch "../destination/$MANIFEST" - copycat vendor --revision "${GIT_TAG:-${GIT_BRANCH%%' (tag)'}}" --sha "$GIT_REVISION" "../destination/$MANIFEST" - | # Generates Ono PR ready release notes from the graphics changelogs changes included in the vendoring. Following line is shell syntax for stripping the @unity3d.com part of email address to only get the author handle From 49a53ee3d5a7c09cc96c04d2dfdfdcd57ed98cb7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Th=C3=A9o=20Penavaire?= Date: Tue, 28 Sep 2021 15:40:45 +0200 Subject: [PATCH 05/14] Install pip3 --- .yamato/_copycat.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.yamato/_copycat.yml b/.yamato/_copycat.yml index 2e02eeb91c8..c0bf1dd1124 100644 --- a/.yamato/_copycat.yml +++ b/.yamato/_copycat.yml @@ -16,6 +16,8 @@ nightly_katana_abv_validate: - echo "[hgunity]" >> $HOME/.hgrc # These 2 lines ask mercurial to run the oncommit formatting hook - echo "format.oncommit=yes" >> $HOME/.hgrc - git clone git@github.cds.internal.unity3d.com:unity/gfx-sdet-tools.git ../gfx-sdet-tools + - sudo apt-get update + - sudo apt-get -y install python3-pip - pip3 install unidiff - copycat vendor --revision "${GIT_TAG:-${GIT_BRANCH%%' (tag)'}}" --sha "$GIT_REVISION" "../destination/$MANIFEST" - python3 ../gfx-sdet-tools/scripts/srp_test_references_updater.py --srp-version $SRP_VERSION --destination-folder ../destination # Updates the test project references because packages are not located at the same relative path in and @@ -41,6 +43,8 @@ vendor: - echo "[hgunity]" >> $HOME/.hgrc - echo "format.oncommit=yes" >> $HOME/.hgrc - git clone git@github.cds.internal.unity3d.com:unity/gfx-sdet-tools.git ../gfx-sdet-tools + - sudo apt-get update + - sudo apt-get -y install python3-pip - pip3 install unidiff - copycat diff -o ../diff.patch "../destination/$MANIFEST" - copycat vendor --revision "${GIT_TAG:-${GIT_BRANCH%%' (tag)'}}" --sha "$GIT_REVISION" "../destination/$MANIFEST" From c747d484d4505cbd1697c89dd3473d2b6aef0405 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Th=C3=A9o=20Penavaire?= Date: Tue, 28 Sep 2021 16:08:36 +0200 Subject: [PATCH 06/14] Update bokken image --- .yamato/config/universal_perf_boatattack.metafile | 4 ++-- .yamato/script/gfx_sdet_tools_revision.txt | 2 +- .yamato/urp_performance_boatattack-android-opengles3.yml | 8 ++++---- .yamato/urp_performance_boatattack-android-vulkan.yml | 8 ++++---- 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/.yamato/config/universal_perf_boatattack.metafile b/.yamato/config/universal_perf_boatattack.metafile index cc9a5438928..a85640b9c58 100644 --- a/.yamato/config/universal_perf_boatattack.metafile +++ b/.yamato/config/universal_perf_boatattack.metafile @@ -233,11 +233,11 @@ platforms: flavor: b1.large standalone_build: type: Unity::VM - image: mobile/android-execution-r19:stable + image: sdet/gamecode_win10:stable flavor: b1.large performance_build_editmode: type: Unity::VM - image: mobile/android-execution-r19:stable + image: sdet/gamecode_win10:stable flavor: b1.large - name: iPhone apis: diff --git a/.yamato/script/gfx_sdet_tools_revision.txt b/.yamato/script/gfx_sdet_tools_revision.txt index ac17f286d91..320346a7839 100644 --- a/.yamato/script/gfx_sdet_tools_revision.txt +++ b/.yamato/script/gfx_sdet_tools_revision.txt @@ -1 +1 @@ -83513b1518a8c43db2e2a009ca37e8a7f55c5196 +b6f20f8e70f39d040d5dab009a3e6f97cef514d9 diff --git a/.yamato/urp_performance_boatattack-android-opengles3.yml b/.yamato/urp_performance_boatattack-android-opengles3.yml index 760194cec3c..0c0da642906 100644 --- a/.yamato/urp_performance_boatattack-android-opengles3.yml +++ b/.yamato/urp_performance_boatattack-android-opengles3.yml @@ -60,7 +60,7 @@ Build_URP_Performance_BoatAttack_Android_OpenGLES3_performance_playmode_runtime_ name: Build URP_Performance_BoatAttack on Android_OpenGLES3_il2cpp_Linear_performance_playmode_runtime_build_Player on version 2021.1 agent: type: Unity::VM - image: mobile/android-execution-r19:stable + image: sdet/gamecode_win10:stable flavor: b1.large variables: UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates @@ -130,7 +130,7 @@ URP_Performance_BoatAttack_Android_OpenGLES3_performance_build_editmode_il2cpp_L name: URP_Performance_BoatAttack on Android_OpenGLES3_performance_build_editmode_il2cpp_Linear on version 2021.1 agent: type: Unity::VM - image: mobile/android-execution-r19:stable + image: sdet/gamecode_win10:stable flavor: b1.large variables: UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates @@ -245,7 +245,7 @@ Build_URP_Performance_BoatAttack_Android_OpenGLES3_performance_playmode_runtime_ name: Build URP_Performance_BoatAttack on Android_OpenGLES3_il2cpp_Linear_performance_playmode_runtime_build_Player on version CUSTOM-REVISION agent: type: Unity::VM - image: mobile/android-execution-r19:stable + image: sdet/gamecode_win10:stable flavor: b1.large variables: UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates @@ -315,7 +315,7 @@ URP_Performance_BoatAttack_Android_OpenGLES3_performance_build_editmode_il2cpp_L name: URP_Performance_BoatAttack on Android_OpenGLES3_performance_build_editmode_il2cpp_Linear on version CUSTOM-REVISION agent: type: Unity::VM - image: mobile/android-execution-r19:stable + image: sdet/gamecode_win10:stable flavor: b1.large variables: UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates diff --git a/.yamato/urp_performance_boatattack-android-vulkan.yml b/.yamato/urp_performance_boatattack-android-vulkan.yml index 628daea7dfd..945975969b0 100644 --- a/.yamato/urp_performance_boatattack-android-vulkan.yml +++ b/.yamato/urp_performance_boatattack-android-vulkan.yml @@ -60,7 +60,7 @@ Build_URP_Performance_BoatAttack_Android_Vulkan_performance_playmode_runtime_il2 name: Build URP_Performance_BoatAttack on Android_Vulkan_il2cpp_Linear_performance_playmode_runtime_build_Player on version 2021.1 agent: type: Unity::VM - image: mobile/android-execution-r19:stable + image: sdet/gamecode_win10:stable flavor: b1.large variables: UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates @@ -130,7 +130,7 @@ URP_Performance_BoatAttack_Android_Vulkan_performance_build_editmode_il2cpp_Line name: URP_Performance_BoatAttack on Android_Vulkan_performance_build_editmode_il2cpp_Linear on version 2021.1 agent: type: Unity::VM - image: mobile/android-execution-r19:stable + image: sdet/gamecode_win10:stable flavor: b1.large variables: UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates @@ -245,7 +245,7 @@ Build_URP_Performance_BoatAttack_Android_Vulkan_performance_playmode_runtime_il2 name: Build URP_Performance_BoatAttack on Android_Vulkan_il2cpp_Linear_performance_playmode_runtime_build_Player on version CUSTOM-REVISION agent: type: Unity::VM - image: mobile/android-execution-r19:stable + image: sdet/gamecode_win10:stable flavor: b1.large variables: UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates @@ -315,7 +315,7 @@ URP_Performance_BoatAttack_Android_Vulkan_performance_build_editmode_il2cpp_Line name: URP_Performance_BoatAttack on Android_Vulkan_performance_build_editmode_il2cpp_Linear on version CUSTOM-REVISION agent: type: Unity::VM - image: mobile/android-execution-r19:stable + image: sdet/gamecode_win10:stable flavor: b1.large variables: UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates From 7fbcc7473b176c5eed372a4e7887f926385bfd0d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Th=C3=A9o=20Penavaire?= Date: Tue, 28 Sep 2021 16:10:40 +0200 Subject: [PATCH 07/14] Revert "Update bokken image" This reverts commit c747d484d4505cbd1697c89dd3473d2b6aef0405. --- .yamato/config/universal_perf_boatattack.metafile | 4 ++-- .yamato/script/gfx_sdet_tools_revision.txt | 2 +- .yamato/urp_performance_boatattack-android-opengles3.yml | 8 ++++---- .yamato/urp_performance_boatattack-android-vulkan.yml | 8 ++++---- 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/.yamato/config/universal_perf_boatattack.metafile b/.yamato/config/universal_perf_boatattack.metafile index a85640b9c58..cc9a5438928 100644 --- a/.yamato/config/universal_perf_boatattack.metafile +++ b/.yamato/config/universal_perf_boatattack.metafile @@ -233,11 +233,11 @@ platforms: flavor: b1.large standalone_build: type: Unity::VM - image: sdet/gamecode_win10:stable + image: mobile/android-execution-r19:stable flavor: b1.large performance_build_editmode: type: Unity::VM - image: sdet/gamecode_win10:stable + image: mobile/android-execution-r19:stable flavor: b1.large - name: iPhone apis: diff --git a/.yamato/script/gfx_sdet_tools_revision.txt b/.yamato/script/gfx_sdet_tools_revision.txt index 320346a7839..ac17f286d91 100644 --- a/.yamato/script/gfx_sdet_tools_revision.txt +++ b/.yamato/script/gfx_sdet_tools_revision.txt @@ -1 +1 @@ -b6f20f8e70f39d040d5dab009a3e6f97cef514d9 +83513b1518a8c43db2e2a009ca37e8a7f55c5196 diff --git a/.yamato/urp_performance_boatattack-android-opengles3.yml b/.yamato/urp_performance_boatattack-android-opengles3.yml index 0c0da642906..760194cec3c 100644 --- a/.yamato/urp_performance_boatattack-android-opengles3.yml +++ b/.yamato/urp_performance_boatattack-android-opengles3.yml @@ -60,7 +60,7 @@ Build_URP_Performance_BoatAttack_Android_OpenGLES3_performance_playmode_runtime_ name: Build URP_Performance_BoatAttack on Android_OpenGLES3_il2cpp_Linear_performance_playmode_runtime_build_Player on version 2021.1 agent: type: Unity::VM - image: sdet/gamecode_win10:stable + image: mobile/android-execution-r19:stable flavor: b1.large variables: UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates @@ -130,7 +130,7 @@ URP_Performance_BoatAttack_Android_OpenGLES3_performance_build_editmode_il2cpp_L name: URP_Performance_BoatAttack on Android_OpenGLES3_performance_build_editmode_il2cpp_Linear on version 2021.1 agent: type: Unity::VM - image: sdet/gamecode_win10:stable + image: mobile/android-execution-r19:stable flavor: b1.large variables: UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates @@ -245,7 +245,7 @@ Build_URP_Performance_BoatAttack_Android_OpenGLES3_performance_playmode_runtime_ name: Build URP_Performance_BoatAttack on Android_OpenGLES3_il2cpp_Linear_performance_playmode_runtime_build_Player on version CUSTOM-REVISION agent: type: Unity::VM - image: sdet/gamecode_win10:stable + image: mobile/android-execution-r19:stable flavor: b1.large variables: UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates @@ -315,7 +315,7 @@ URP_Performance_BoatAttack_Android_OpenGLES3_performance_build_editmode_il2cpp_L name: URP_Performance_BoatAttack on Android_OpenGLES3_performance_build_editmode_il2cpp_Linear on version CUSTOM-REVISION agent: type: Unity::VM - image: sdet/gamecode_win10:stable + image: mobile/android-execution-r19:stable flavor: b1.large variables: UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates diff --git a/.yamato/urp_performance_boatattack-android-vulkan.yml b/.yamato/urp_performance_boatattack-android-vulkan.yml index 945975969b0..628daea7dfd 100644 --- a/.yamato/urp_performance_boatattack-android-vulkan.yml +++ b/.yamato/urp_performance_boatattack-android-vulkan.yml @@ -60,7 +60,7 @@ Build_URP_Performance_BoatAttack_Android_Vulkan_performance_playmode_runtime_il2 name: Build URP_Performance_BoatAttack on Android_Vulkan_il2cpp_Linear_performance_playmode_runtime_build_Player on version 2021.1 agent: type: Unity::VM - image: sdet/gamecode_win10:stable + image: mobile/android-execution-r19:stable flavor: b1.large variables: UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates @@ -130,7 +130,7 @@ URP_Performance_BoatAttack_Android_Vulkan_performance_build_editmode_il2cpp_Line name: URP_Performance_BoatAttack on Android_Vulkan_performance_build_editmode_il2cpp_Linear on version 2021.1 agent: type: Unity::VM - image: sdet/gamecode_win10:stable + image: mobile/android-execution-r19:stable flavor: b1.large variables: UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates @@ -245,7 +245,7 @@ Build_URP_Performance_BoatAttack_Android_Vulkan_performance_playmode_runtime_il2 name: Build URP_Performance_BoatAttack on Android_Vulkan_il2cpp_Linear_performance_playmode_runtime_build_Player on version CUSTOM-REVISION agent: type: Unity::VM - image: sdet/gamecode_win10:stable + image: mobile/android-execution-r19:stable flavor: b1.large variables: UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates @@ -315,7 +315,7 @@ URP_Performance_BoatAttack_Android_Vulkan_performance_build_editmode_il2cpp_Line name: URP_Performance_BoatAttack on Android_Vulkan_performance_build_editmode_il2cpp_Linear on version CUSTOM-REVISION agent: type: Unity::VM - image: sdet/gamecode_win10:stable + image: mobile/android-execution-r19:stable flavor: b1.large variables: UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates From be3e4dee8a6d6a66f70beb0ed98f7be561060e2a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Th=C3=A9o=20Penavaire?= Date: Wed, 29 Sep 2021 14:09:02 +0200 Subject: [PATCH 08/14] Remove useless step on 2021.1/staging --- .yamato/_copycat.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.yamato/_copycat.yml b/.yamato/_copycat.yml index c0bf1dd1124..71a5433d369 100644 --- a/.yamato/_copycat.yml +++ b/.yamato/_copycat.yml @@ -20,7 +20,6 @@ nightly_katana_abv_validate: - sudo apt-get -y install python3-pip - pip3 install unidiff - copycat vendor --revision "${GIT_TAG:-${GIT_BRANCH%%' (tag)'}}" --sha "$GIT_REVISION" "../destination/$MANIFEST" - - python3 ../gfx-sdet-tools/scripts/srp_test_references_updater.py --srp-version $SRP_VERSION --destination-folder ../destination # Updates the test project references because packages are not located at the same relative path in and - copycat katana "../destination/$MANIFEST" triggers: recurring: @@ -51,7 +50,6 @@ vendor: - | # Generates Ono PR ready release notes from the graphics changelogs changes included in the vendoring. Following line is shell syntax for stripping the @unity3d.com part of email address to only get the author handle author=${YAMATO_OWNER_EMAIL%@unity3d.com} python3 ../gfx-sdet-tools/scripts/gfx_to_ono_changelog_converter.py --author "$author" --unity-target-branch "$RELEASE_BRANCH" - - python3 ../gfx-sdet-tools/scripts/srp_test_references_updater.py --srp-version $SRP_VERSION --destination-folder ../destination - copycat ono --no-reviewers "../destination/$MANIFEST" ../diff.patch - copycat katana "../destination/$MANIFEST" artifacts: From 69aea01845a15cc594780c6e84a1fe05f9e164ee Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Th=C3=A9o=20Penavaire?= Date: Thu, 30 Sep 2021 11:36:02 +0200 Subject: [PATCH 09/14] Add debug --- .yamato/_copycat.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.yamato/_copycat.yml b/.yamato/_copycat.yml index 71a5433d369..2b4def76394 100644 --- a/.yamato/_copycat.yml +++ b/.yamato/_copycat.yml @@ -51,6 +51,7 @@ vendor: author=${YAMATO_OWNER_EMAIL%@unity3d.com} python3 ../gfx-sdet-tools/scripts/gfx_to_ono_changelog_converter.py --author "$author" --unity-target-branch "$RELEASE_BRANCH" - copycat ono --no-reviewers "../destination/$MANIFEST" ../diff.patch + - hg status -i - copycat katana "../destination/$MANIFEST" artifacts: release_notes: From 62acc9bf796e83d55247a6e1281ece1d0d2daea0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Th=C3=A9o=20Penavaire?= Date: Thu, 30 Sep 2021 13:09:33 +0200 Subject: [PATCH 10/14] Add debug --- .yamato/_copycat.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.yamato/_copycat.yml b/.yamato/_copycat.yml index 2b4def76394..c463f74d68e 100644 --- a/.yamato/_copycat.yml +++ b/.yamato/_copycat.yml @@ -51,8 +51,9 @@ vendor: author=${YAMATO_OWNER_EMAIL%@unity3d.com} python3 ../gfx-sdet-tools/scripts/gfx_to_ono_changelog_converter.py --author "$author" --unity-target-branch "$RELEASE_BRANCH" - copycat ono --no-reviewers "../destination/$MANIFEST" ../diff.patch - - hg status -i - copycat katana "../destination/$MANIFEST" + after: + - hg status -i artifacts: release_notes: paths: From 5ee14a415a17c8da4f7e89dab3b5d6834530fdc6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Th=C3=A9o=20Penavaire?= Date: Thu, 30 Sep 2021 13:15:05 +0200 Subject: [PATCH 11/14] Add debug --- .yamato/_copycat.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.yamato/_copycat.yml b/.yamato/_copycat.yml index c463f74d68e..9a393acde81 100644 --- a/.yamato/_copycat.yml +++ b/.yamato/_copycat.yml @@ -53,7 +53,7 @@ vendor: - copycat ono --no-reviewers "../destination/$MANIFEST" ../diff.patch - copycat katana "../destination/$MANIFEST" after: - - hg status -i + - cd ../destination && hg status -i artifacts: release_notes: paths: From 815a54f0699f4e60583dad98ef0454a29bb15b4f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Th=C3=A9o=20Penavaire?= Date: Thu, 30 Sep 2021 14:01:55 +0200 Subject: [PATCH 12/14] hg purge preformat.bak files after reformat --- .yamato/_copycat.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.yamato/_copycat.yml b/.yamato/_copycat.yml index 9a393acde81..ea0a58e27b9 100644 --- a/.yamato/_copycat.yml +++ b/.yamato/_copycat.yml @@ -50,6 +50,7 @@ vendor: - | # Generates Ono PR ready release notes from the graphics changelogs changes included in the vendoring. Following line is shell syntax for stripping the @unity3d.com part of email address to only get the author handle author=${YAMATO_OWNER_EMAIL%@unity3d.com} python3 ../gfx-sdet-tools/scripts/gfx_to_ono_changelog_converter.py --author "$author" --unity-target-branch "$RELEASE_BRANCH" + - cd ../destination && hg purge --all && cd - - copycat ono --no-reviewers "../destination/$MANIFEST" ../diff.patch - copycat katana "../destination/$MANIFEST" after: From 31044ad2103d4be2897144daca7ba3ec255e3676 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Th=C3=A9o=20Penavaire?= Date: Thu, 30 Sep 2021 14:46:09 +0200 Subject: [PATCH 13/14] Install purge extension --- .yamato/_copycat.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.yamato/_copycat.yml b/.yamato/_copycat.yml index ea0a58e27b9..ed0911958b1 100644 --- a/.yamato/_copycat.yml +++ b/.yamato/_copycat.yml @@ -15,11 +15,14 @@ nightly_katana_abv_validate: - eval "$COPYCAT_1" - echo "[hgunity]" >> $HOME/.hgrc # These 2 lines ask mercurial to run the oncommit formatting hook - echo "format.oncommit=yes" >> $HOME/.hgrc + - echo "[extensions]" >> $HOME/.hgrc + - echo "purge=" >> $HOME/.hgrc - git clone git@github.cds.internal.unity3d.com:unity/gfx-sdet-tools.git ../gfx-sdet-tools - sudo apt-get update - sudo apt-get -y install python3-pip - pip3 install unidiff - copycat vendor --revision "${GIT_TAG:-${GIT_BRANCH%%' (tag)'}}" --sha "$GIT_REVISION" "../destination/$MANIFEST" + - cd ../destination && hg purge --all && cd - - copycat katana "../destination/$MANIFEST" triggers: recurring: @@ -41,6 +44,8 @@ vendor: - eval "$COPYCAT_1" - echo "[hgunity]" >> $HOME/.hgrc - echo "format.oncommit=yes" >> $HOME/.hgrc + - echo "[extensions]" >> $HOME/.hgrc + - echo "purge=" >> $HOME/.hgrc - git clone git@github.cds.internal.unity3d.com:unity/gfx-sdet-tools.git ../gfx-sdet-tools - sudo apt-get update - sudo apt-get -y install python3-pip From c7cef14952ccc29770bef1137b884c0ca18697f8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Th=C3=A9o=20Penavaire?= Date: Fri, 1 Oct 2021 10:49:36 +0200 Subject: [PATCH 14/14] Use fix branch --- .yamato/_copycat.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.yamato/_copycat.yml b/.yamato/_copycat.yml index ed0911958b1..b82f06b7371 100644 --- a/.yamato/_copycat.yml +++ b/.yamato/_copycat.yml @@ -47,6 +47,7 @@ vendor: - echo "[extensions]" >> $HOME/.hgrc - echo "purge=" >> $HOME/.hgrc - git clone git@github.cds.internal.unity3d.com:unity/gfx-sdet-tools.git ../gfx-sdet-tools + - git -C ../gfx-sdet-tools checkout changelog-converter/fix - sudo apt-get update - sudo apt-get -y install python3-pip - pip3 install unidiff @@ -56,8 +57,8 @@ vendor: author=${YAMATO_OWNER_EMAIL%@unity3d.com} python3 ../gfx-sdet-tools/scripts/gfx_to_ono_changelog_converter.py --author "$author" --unity-target-branch "$RELEASE_BRANCH" - cd ../destination && hg purge --all && cd - - - copycat ono --no-reviewers "../destination/$MANIFEST" ../diff.patch - - copycat katana "../destination/$MANIFEST" + # - copycat ono --no-reviewers "../destination/$MANIFEST" ../diff.patch + # - copycat katana "../destination/$MANIFEST" after: - cd ../destination && hg status -i artifacts: