From 07e92948c8ad3cc902dbf6fc313c10e8e5e5597d Mon Sep 17 00:00:00 2001
From: topjohnwu <topjohnwu@gmail.com>
Date: Sun, 22 Feb 2026 15:23:52 -0800
Subject: [PATCH] Add CI tests for Android 17

---
 .github/kvm.sh              |  5 +++++
 .github/workflows/build.yml | 15 ++++++---------
 scripts/avd.sh              |  1 +
 scripts/cuttlefish.sh       |  3 ---
 4 files changed, 12 insertions(+), 12 deletions(-)
 create mode 100755 .github/kvm.sh

diff --git a/.github/kvm.sh b/.github/kvm.sh
new file mode 100755
index 000000000..286ce53ad
--- /dev/null
+++ b/.github/kvm.sh
@@ -0,0 +1,5 @@
+#!/usr/bin/env bash
+
+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
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index c17e7afb9..9343c6201 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -85,7 +85,7 @@ jobs:
         version: [23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 36.1, "CANARY"]
         type: [""]
         include:
-          - version: "CANARY"
+          - version: "CinnamonBun"
             type: "google_apis_ps16k"
 
     steps:
@@ -99,10 +99,7 @@ jobs:
           path: out
 
       - 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
+        run: .github/kvm.sh
 
       - name: Run AVD test
         timeout-minutes: 15
@@ -140,10 +137,7 @@ jobs:
           path: out
 
       - 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
+        run: .github/kvm.sh
 
       - name: Run AVD test
         timeout-minutes: 15
@@ -185,6 +179,9 @@ jobs:
           name: ${{ github.sha }}
           path: out
 
+      - name: Enable KVM group perms
+        run: .github/kvm.sh
+
       - name: Setup Cuttlefish environment
         run: |
           scripts/cuttlefish.sh setup
diff --git a/scripts/avd.sh b/scripts/avd.sh
index de7225fe3..e0714d444 100755
--- a/scripts/avd.sh
+++ b/scripts/avd.sh
@@ -92,6 +92,7 @@ resolve_vars() {
     UpsideDownCakePrivacySandbox) api=34 ;;
     VanillaIceCream) api=35 ;;
     Baklava) api=36 ;;
+    CinnamonBun) api=37 ;;
     *CANARY) api=10000 ;;
     *)
       print_error "! Unknown system image version '$ver'"
diff --git a/scripts/cuttlefish.sh b/scripts/cuttlefish.sh
index f4ec6d9f8..cb20c37ad 100755
--- a/scripts/cuttlefish.sh
+++ b/scripts/cuttlefish.sh
@@ -23,9 +23,6 @@ setup_env() {
   sudo apt-get update
   sudo dpkg -i ./cuttlefish-base_*_*64.deb || sudo apt-get install -f
   rm cuttlefish-base_*_*64.deb
-  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
   sudo usermod -aG kvm,cvdnetwork,render $USER
   yes | "$sdk" --licenses > /dev/null
   "$sdk" --channel=3 platform-tools