From 798139b55901b9fb5817fded17a08e88ee5ee1ba Mon Sep 17 00:00:00 2001 From: Reid Baker Date: Fri, 1 Nov 2024 14:52:15 -0400 Subject: [PATCH 01/10] Update emulator defintions version to latest available from chrome infra --- ci/builders/linux_android_emulator.json | 6 +++--- ci/builders/linux_android_emulator_34.json | 6 +++--- ci/builders/linux_android_emulator_opengles_34.json | 4 ++-- ci/builders/standalone/linux_android_emulator_skia.json | 4 ++-- ci/builders/standalone/linux_android_emulator_skia_34.json | 4 ++-- 5 files changed, 12 insertions(+), 12 deletions(-) diff --git a/ci/builders/linux_android_emulator.json b/ci/builders/linux_android_emulator.json index 3a1745ec18619..7a4fd87b45438 100644 --- a/ci/builders/linux_android_emulator.json +++ b/ci/builders/linux_android_emulator.json @@ -46,7 +46,7 @@ }, { "dependency": "avd_cipd_version", - "version": "build_id:8735216702926189361" + "version": "build_id:8733065022087935185" } ], "contexts": [ @@ -78,7 +78,7 @@ }, { "dependency": "avd_cipd_version", - "version": "build_id:8735216702926189361" + "version": "build_id:8733065022087935185" } ], "contexts": [ @@ -139,7 +139,7 @@ }, { "dependency": "avd_cipd_version", - "version": "build_id:8735216702926189361" + "version": "build_id:8733065022087935185" } ], "contexts": [ diff --git a/ci/builders/linux_android_emulator_34.json b/ci/builders/linux_android_emulator_34.json index a9f7fb3fcb8d5..1e5c2b8a476b3 100644 --- a/ci/builders/linux_android_emulator_34.json +++ b/ci/builders/linux_android_emulator_34.json @@ -46,7 +46,7 @@ }, { "dependency": "avd_cipd_version", - "version": "build_id:8740267484269553649" + "version": "build_id:8733065022087935185" } ], "contexts": [ @@ -78,7 +78,7 @@ }, { "dependency": "avd_cipd_version", - "version": "build_id:8740267484269553649" + "version": "build_id:8733065022087935185" } ], "contexts": [ @@ -139,7 +139,7 @@ }, { "dependency": "avd_cipd_version", - "version": "build_id:8740267484269553649" + "version": "build_id:8733065022087935185" } ], "contexts": [ diff --git a/ci/builders/linux_android_emulator_opengles_34.json b/ci/builders/linux_android_emulator_opengles_34.json index 8d3bfb423a105..5d3dfdb9337a6 100644 --- a/ci/builders/linux_android_emulator_opengles_34.json +++ b/ci/builders/linux_android_emulator_opengles_34.json @@ -46,7 +46,7 @@ }, { "dependency": "avd_cipd_version", - "version": "build_id:8740267484269553649" + "version": "build_id:8733065022087935185" } ], "contexts": [ @@ -78,7 +78,7 @@ }, { "dependency": "avd_cipd_version", - "version": "build_id:8740267484269553649" + "version": "build_id:8733065022087935185" } ], "contexts": [ diff --git a/ci/builders/standalone/linux_android_emulator_skia.json b/ci/builders/standalone/linux_android_emulator_skia.json index a4553271f5d3d..148552a96a66c 100644 --- a/ci/builders/standalone/linux_android_emulator_skia.json +++ b/ci/builders/standalone/linux_android_emulator_skia.json @@ -40,7 +40,7 @@ }, { "dependency": "avd_cipd_version", - "version": "build_id:8735216702926189361" + "version": "build_id:8733065022087935185" } ], "contexts": [ @@ -64,7 +64,7 @@ }, { "dependency": "avd_cipd_version", - "version": "build_id:8735216702926189361" + "version": "build_id:8733065022087935185" } ], "contexts": [ diff --git a/ci/builders/standalone/linux_android_emulator_skia_34.json b/ci/builders/standalone/linux_android_emulator_skia_34.json index cbaf9a95b7732..88e6c68cc6a9d 100644 --- a/ci/builders/standalone/linux_android_emulator_skia_34.json +++ b/ci/builders/standalone/linux_android_emulator_skia_34.json @@ -40,7 +40,7 @@ }, { "dependency": "avd_cipd_version", - "version": "build_id:8740267484269553649" + "version": "build_id:8733065022087935185" } ], "contexts": [ @@ -64,7 +64,7 @@ }, { "dependency": "avd_cipd_version", - "version": "build_id:8740267484269553649" + "version": "build_id:8733065022087935185" } ], "contexts": [ From c8c9e659e023f4e5e018894dfe22c50c6146513e Mon Sep 17 00:00:00 2001 From: Reid Baker Date: Wed, 6 Nov 2024 14:11:40 -0500 Subject: [PATCH 02/10] Mark all emulator tests non bringup so they run in presubmit --- .ci.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.ci.yaml b/.ci.yaml index 448d669382844..f3a15d51f26a3 100644 --- a/.ci.yaml +++ b/.ci.yaml @@ -56,7 +56,7 @@ targets: timeout: 180 - name: Linux linux_android_emulator_tests - bringup: true + bringup: false enabled_branches: - main recipe: engine_v2/engine_v2 @@ -117,7 +117,7 @@ targets: - testing/skia_gold_client/** - name: Linux linux_android_emulator_skia_tests - bringup: true + bringup: false enabled_branches: - main recipe: engine_v2/builder @@ -578,7 +578,7 @@ targets: config_name: windows_unopt - name: Linux ci_yaml engine roller - bringup: true + bringup: false recipe: infra/ci_yaml properties: backfill: "false" From a6faceace899e37f097303dbd858c38711d150de Mon Sep 17 00:00:00 2001 From: Reid Baker Date: Wed, 6 Nov 2024 14:16:19 -0500 Subject: [PATCH 03/10] Update .ci.yaml --- .ci.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.ci.yaml b/.ci.yaml index f3a15d51f26a3..1049d1b8e7ad3 100644 --- a/.ci.yaml +++ b/.ci.yaml @@ -578,7 +578,7 @@ targets: config_name: windows_unopt - name: Linux ci_yaml engine roller - bringup: false + bringup: true recipe: infra/ci_yaml properties: backfill: "false" From 46ba3c1990211ea3b505619608d33b6fdbe53590 Mon Sep 17 00:00:00 2001 From: Christopher Fujino Date: Thu, 14 Nov 2024 15:47:30 -0800 Subject: [PATCH 04/10] test this on the new Ubuntu 22 image --- ci/builders/linux_android_emulator_opengles_34.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ci/builders/linux_android_emulator_opengles_34.json b/ci/builders/linux_android_emulator_opengles_34.json index 5d3dfdb9337a6..2758488b3a3bf 100644 --- a/ci/builders/linux_android_emulator_opengles_34.json +++ b/ci/builders/linux_android_emulator_opengles_34.json @@ -3,7 +3,7 @@ { "drone_dimensions": [ "device_type=none", - "os=Linux", + "os=Ubuntu-22", "kvm=1", "cores=8" ], @@ -94,4 +94,4 @@ ] } ] -} \ No newline at end of file +} From 22df3a444735b6349a2cdfb291246128aca7683a Mon Sep 17 00:00:00 2001 From: Christopher Fujino Date: Thu, 14 Nov 2024 15:58:32 -0800 Subject: [PATCH 05/10] also os=Linux --- ci/builders/linux_android_emulator_opengles_34.json | 1 + 1 file changed, 1 insertion(+) diff --git a/ci/builders/linux_android_emulator_opengles_34.json b/ci/builders/linux_android_emulator_opengles_34.json index 2758488b3a3bf..d3732f645f0ea 100644 --- a/ci/builders/linux_android_emulator_opengles_34.json +++ b/ci/builders/linux_android_emulator_opengles_34.json @@ -3,6 +3,7 @@ { "drone_dimensions": [ "device_type=none", + "os=Linux", "os=Ubuntu-22", "kvm=1", "cores=8" From 14ac74e688a3af8ee40110fd7e785e96443a09f4 Mon Sep 17 00:00:00 2001 From: Reid Baker Date: Mon, 18 Nov 2024 14:12:12 -0600 Subject: [PATCH 06/10] unset bringup true for android emulator tests --- .ci.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.ci.yaml b/.ci.yaml index 949501895f8e4..1687b69e18963 100644 --- a/.ci.yaml +++ b/.ci.yaml @@ -56,7 +56,7 @@ targets: timeout: 180 - name: Linux linux_android_emulator_tests - bringup: false + bringup: true enabled_branches: - main recipe: engine_v2/engine_v2 @@ -117,7 +117,7 @@ targets: - testing/skia_gold_client/** - name: Linux linux_android_emulator_skia_tests - bringup: false + bringup: true enabled_branches: - main recipe: engine_v2/builder From b317ff266e0efef71090d879489742e6c675c2a3 Mon Sep 17 00:00:00 2001 From: Reid Baker Date: Mon, 18 Nov 2024 14:13:08 -0600 Subject: [PATCH 07/10] Remove ubuntu 22 requirement --- ci/builders/linux_android_emulator_opengles_34.json | 1 - 1 file changed, 1 deletion(-) diff --git a/ci/builders/linux_android_emulator_opengles_34.json b/ci/builders/linux_android_emulator_opengles_34.json index d3732f645f0ea..e251d97e85514 100644 --- a/ci/builders/linux_android_emulator_opengles_34.json +++ b/ci/builders/linux_android_emulator_opengles_34.json @@ -4,7 +4,6 @@ "drone_dimensions": [ "device_type=none", "os=Linux", - "os=Ubuntu-22", "kvm=1", "cores=8" ], From 7e35bdbdf68b14d913a6f7debfca9f0e12307c5a Mon Sep 17 00:00:00 2001 From: Reid Baker Date: Mon, 18 Nov 2024 14:59:46 -0600 Subject: [PATCH 08/10] Do not update x86 emulators --- ci/builders/linux_android_emulator.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/ci/builders/linux_android_emulator.json b/ci/builders/linux_android_emulator.json index 7a4fd87b45438..bbdf67bc6bfd6 100644 --- a/ci/builders/linux_android_emulator.json +++ b/ci/builders/linux_android_emulator.json @@ -139,7 +139,8 @@ }, { "dependency": "avd_cipd_version", - "version": "build_id:8733065022087935185" + # Do not update build. x86 emulators do not support swangle + "version": "build_id:8735216702926189361" } ], "contexts": [ From 4c03f3995f6da9051a188c74b08350c06b1f0b72 Mon Sep 17 00:00:00 2001 From: Reid Baker Date: Mon, 18 Nov 2024 15:04:25 -0600 Subject: [PATCH 09/10] Update linux_android_emulator.json --- ci/builders/linux_android_emulator.json | 1 - 1 file changed, 1 deletion(-) diff --git a/ci/builders/linux_android_emulator.json b/ci/builders/linux_android_emulator.json index bbdf67bc6bfd6..b60f608d11d2d 100644 --- a/ci/builders/linux_android_emulator.json +++ b/ci/builders/linux_android_emulator.json @@ -139,7 +139,6 @@ }, { "dependency": "avd_cipd_version", - # Do not update build. x86 emulators do not support swangle "version": "build_id:8735216702926189361" } ], From dc32feba7b47ed931981594cd95a5a56e45743fd Mon Sep 17 00:00:00 2001 From: Reid Baker Date: Mon, 18 Nov 2024 16:04:57 -0600 Subject: [PATCH 10/10] Update linux_android_emulator_34.json --- ci/builders/linux_android_emulator_34.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ci/builders/linux_android_emulator_34.json b/ci/builders/linux_android_emulator_34.json index 1e5c2b8a476b3..0a4f1f3aa3185 100644 --- a/ci/builders/linux_android_emulator_34.json +++ b/ci/builders/linux_android_emulator_34.json @@ -139,7 +139,7 @@ }, { "dependency": "avd_cipd_version", - "version": "build_id:8733065022087935185" + "version": "build_id:8740267484269553649" } ], "contexts": [ @@ -156,4 +156,4 @@ ] } ] -} \ No newline at end of file +}