Introduce GMD + ATD (#479)

thagikura · web-flow · commit 4633609930fd · 2023-01-10T18:15:34.000+09:00
Introduce Gradle Managed Device definitions to modules that have instrumented tests. At the moment, defining it as a convention plugin isn't possible due to the bug. That bug is now fixed and will be included in Android Studio Flamingo. Once Flamingo becomes stable, convert the GMD definitions as a convention plugin (#523) Change-Id: I0866369e3d0bbe148ca5ec1f92bad59239a347b8
diff --git a/.github/workflows/AndroidCIWithGmd.yaml b/.github/workflows/AndroidCIWithGmd.yaml
@@ -0,0 +1,31 @@
+name: Android CI with GMD
+
+on:
+  push:
+    branches:
+      - main
+  pull_request:
+
+jobs:
+
+  android-ci:
+    runs-on: macos-latest
+
+    steps:
+    - uses: actions/setup-java@v3
+      with:
+        distribution: 'zulu'
+        java-version: '11'
+    - uses: actions/checkout@v2
+
+    - name: Run instrumented tests with GMD
+      continue-on-error: true
+      run: ./gradlew cleanManagedDevices --unused-only && ./gradlew pixel4api30DemoDebugAndroidTest -Dorg.gradle.workers.max=1  -Pandroid.testoptions.manageddevices.emulator.gpu="swiftshader_indirect" -Pandroid.experimental.testOptions.managedDevices.emulator.showKernelLogging=true --info
+
+    - name: Upload test reports
+      if: success() || failure()
+      uses: actions/upload-artifact@v3
+      with:
+        name: test-reports
+        path: |
+          '**/*/build/reports/androidTests/'
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
@@ -73,6 +73,17 @@ android {
         unitTests {
             isIncludeAndroidResources = true
         }
+        // TODO: Convert it as a convention plugin once Flamingo goes out (https://github.com/android/nowinandroid/issues/523)
+        managedDevices {
+            devices {
+                maybeCreate<com.android.build.api.dsl.ManagedVirtualDevice>("pixel4api30").apply {
+                    device = "Pixel 4"
+                    apiLevel = 30
+                    // ATDs currently support only API level 30.
+                    systemImageSource = "aosp-atd"
+                }
+            }
+        }
     }
     namespace = "com.google.samples.apps.nowinandroid"
 }
diff --git a/benchmarks/build.gradle.kts b/benchmarks/build.gradle.kts
@@ -67,6 +67,7 @@ android {
     experimentalProperties["android.experimental.self-instrumenting"] = true
 
     testOptions {
+        // TODO: Convert it as a convention plugin once Flamingo goes out (https://github.com/android/nowinandroid/issues/523)
         managedDevices {
             devices {
                 create<ManagedVirtualDevice>("pixel6Api31") {
diff --git a/core/database/build.gradle.kts b/core/database/build.gradle.kts
@@ -34,6 +34,20 @@ android {
         testInstrumentationRunner = "com.google.samples.apps.nowinandroid.core.testing.NiaTestRunner"
     }
     namespace = "com.google.samples.apps.nowinandroid.core.database"
+
+    testOptions {
+        // TODO: Convert it as a convention plugin once Flamingo goes out (https://github.com/android/nowinandroid/issues/523)
+        managedDevices {
+            devices {
+                maybeCreate<com.android.build.api.dsl.ManagedVirtualDevice>("pixel4api30").apply {
+                    device = "Pixel 4"
+                    apiLevel = 30
+                    // ATDs currently support only API level 30.
+                    systemImageSource = "aosp-atd"
+                }
+            }
+        }
+    }
 }
 
 dependencies {
diff --git a/feature/bookmarks/build.gradle.kts b/feature/bookmarks/build.gradle.kts
@@ -21,6 +21,20 @@ plugins {
 
 android {
     namespace = "com.google.samples.apps.nowinandroid.feature.bookmarks"
+
+    testOptions {
+        // TODO: Convert it as a convention plugin once Flamingo goes out (https://github.com/android/nowinandroid/issues/523)
+        managedDevices {
+            devices {
+                maybeCreate<com.android.build.api.dsl.ManagedVirtualDevice>("pixel4api30").apply {
+                    device = "Pixel 4"
+                    apiLevel = 30
+                    // ATDs currently support only API level 30.
+                    systemImageSource = "aosp-atd"
+                }
+            }
+        }
+    }
 }
 
 dependencies {
diff --git a/feature/foryou/build.gradle.kts b/feature/foryou/build.gradle.kts
@@ -21,6 +21,20 @@ plugins {
 
 android {
     namespace = "com.google.samples.apps.nowinandroid.feature.foryou"
+
+    testOptions {
+        // TODO: Convert it as a convention plugin once Flamingo goes out (https://github.com/android/nowinandroid/issues/523)
+        managedDevices {
+            devices {
+                maybeCreate<com.android.build.api.dsl.ManagedVirtualDevice>("pixel4api30").apply {
+                    device = "Pixel 4"
+                    apiLevel = 30
+                    // ATDs currently support only API level 30.
+                    systemImageSource = "aosp-atd"
+                }
+            }
+        }
+    }
 }
 
 dependencies {
diff --git a/feature/interests/build.gradle.kts b/feature/interests/build.gradle.kts
@@ -20,4 +20,18 @@ plugins {
 }
 android {
     namespace = "com.google.samples.apps.nowinandroid.feature.interests"
+
+    testOptions {
+        // TODO: Convert it as a convention plugin once Flamingo goes out (https://github.com/android/nowinandroid/issues/523)
+        managedDevices {
+            devices {
+                maybeCreate<com.android.build.api.dsl.ManagedVirtualDevice>("pixel4api30").apply {
+                    device = "Pixel 4"
+                    apiLevel = 30
+                    // ATDs currently support only API level 30.
+                    systemImageSource = "aosp-atd"
+                }
+            }
+        }
+    }
 }
diff --git a/feature/settings/build.gradle.kts b/feature/settings/build.gradle.kts
@@ -21,4 +21,18 @@ plugins {
 
 android {
     namespace = "com.google.samples.apps.nowinandroid.feature.settings"
+
+    testOptions {
+        // TODO: Convert it as a convention plugin once Flamingo goes out (https://github.com/android/nowinandroid/issues/523)
+        managedDevices {
+            devices {
+                maybeCreate<com.android.build.api.dsl.ManagedVirtualDevice>("pixel4api30").apply {
+                    device = "Pixel 4"
+                    apiLevel = 30
+                    // ATDs currently support only API level 30.
+                    systemImageSource = "aosp-atd"
+                }
+            }
+        }
+    }
 }
diff --git a/feature/topic/build.gradle.kts b/feature/topic/build.gradle.kts
@@ -21,6 +21,20 @@ plugins {
 
 android {
     namespace = "com.google.samples.apps.nowinandroid.feature.topic"
+
+    testOptions {
+        // TODO: Convert it as a convention plugin once Flamingo goes out (https://github.com/android/nowinandroid/issues/523)
+        managedDevices {
+            devices {
+                maybeCreate<com.android.build.api.dsl.ManagedVirtualDevice>("pixel4api30").apply {
+                    device = "Pixel 4"
+                    apiLevel = 30
+                    // ATDs currently support only API level 30.
+                    systemImageSource = "aosp-atd"
+                }
+            }
+        }
+    }
 }
 
 dependencies {

Original file line number	Diff line number	Diff line change
`@@ -73,6 +73,17 @@ android {`
`73`	`73`	`unitTests {`
`74`	`74`	`isIncludeAndroidResources = true`
`75`	`75`	`}`
	`76`	`+ // TODO: Convert it as a convention plugin once Flamingo goes out (https://github.com/android/nowinandroid/issues/523)`
	`77`	`+ managedDevices {`
	`78`	`+ devices {`
	`79`	`+ maybeCreate<com.android.build.api.dsl.ManagedVirtualDevice>("pixel4api30").apply {`
	`80`	`+ device = "Pixel 4"`
	`81`	`+ apiLevel = 30`
	`82`	`+ // ATDs currently support only API level 30.`
	`83`	`+ systemImageSource = "aosp-atd"`
	`84`	`+ }`
	`85`	`+ }`
	`86`	`+ }`
`76`	`87`	`}`
`77`	`88`	`namespace = "com.google.samples.apps.nowinandroid"`
`78`	`89`	`}`