From 58888d36bb33d56ee7087d1b4ade8a3785188fb6 Mon Sep 17 00:00:00 2001
From: Ben Weiss <benweiss@google.com>
Date: Thu, 12 Sep 2024 14:25:44 +0200
Subject: [PATCH] Apply guidance from issuetracker

b/287312019

Change-Id: I3c89605e1707ac25d3726e37e9254085cd698191
---
 .github/workflows/Build.yaml | 14 +++++++-------
 benchmarks/build.gradle.kts  |  8 ++++----
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/.github/workflows/Build.yaml b/.github/workflows/Build.yaml
index 205d598f56..0381f0fcbd 100644
--- a/.github/workflows/Build.yaml
+++ b/.github/workflows/Build.yaml
@@ -25,6 +25,13 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v4
 
+      - name: Enable KVM group perms
+        run: |
+          echo 'KERNEL=="kvm", GROUP="kvm", MODE="0666", OPTIONS+="static_node=kvm"' | sudo tee /etc/udev/rules.d/99-kvm4all.rules
+          sudo udevadm control --reload-rules
+          sudo udevadm trigger --name-match=kvm
+          ls /dev/kvm
+
       - name: Copy CI gradle.properties
         run: mkdir -p ~/.gradle ; cp .github/ci-gradle.properties ~/.gradle/gradle.properties
 
@@ -109,13 +116,6 @@ jobs:
           disable_globbing: true
           commit_message: "🤖 Updates screenshots"
 
-      - name: Enable KVM group perms
-        run: |
-          echo 'KERNEL=="kvm", GROUP="kvm", MODE="0666", OPTIONS+="static_node=kvm"' | sudo tee /etc/udev/rules.d/99-kvm4all.rules
-          sudo udevadm control --reload-rules
-          sudo udevadm trigger --name-match=kvm
-          ls /dev/kvm
-
       # Run local tests after screenshot tests to avoid wrong UP-TO-DATE. TODO: Ignore screenshots.
       - name: Run local tests
         if: always()
diff --git a/benchmarks/build.gradle.kts b/benchmarks/build.gradle.kts
index 297248b292..e36f021b09 100644
--- a/benchmarks/build.gradle.kts
+++ b/benchmarks/build.gradle.kts
@@ -46,10 +46,10 @@ android {
     }
 
     testOptions.managedDevices.devices {
-        create<com.android.build.api.dsl.ManagedVirtualDevice>("pixel5Api33") {
-            device = "Pixel 5"
+        create<com.android.build.api.dsl.ManagedVirtualDevice>("pixel6Api33") {
+            device = "Pixel 6"
             apiLevel = 33
-            systemImageSource = "aosp_atd"
+            systemImageSource = "aosp"
         }
     }
 
@@ -60,7 +60,7 @@ android {
 baselineProfile {
     // This specifies the managed devices to use that you run the tests on.
     managedDevices.clear()
-    managedDevices += "pixel5Api33"
+    managedDevices += "pixel6Api33"
 
     // Don't use a connected device but rely on a GMD for consistency between local and CI builds.
     useConnectedDevices = false