Skip to content
This repository was archived by the owner on Feb 25, 2025. It is now read-only.

Split tests out of Linux Android artifact creation builds #54683

Merged
merged 1 commit into from
Aug 21, 2024
Merged

Split tests out of Linux Android artifact creation builds #54683

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
42 changes: 4 additions & 38 deletions ci/builders/linux_android_debug_engine.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,26 +36,9 @@
"targets": [
"flutter",
"flutter/shell/platform/android:embedding_jars",
"flutter/shell/platform/android:abi_jars",
"flutter/shell/platform/android:robolectric_tests"
"flutter/shell/platform/android:abi_jars"
]
},
"tests": [
{
"language": "python3",
"name": "Host Tests for android_jit_release_x86",
"script": "flutter/testing/run_tests.py",
"parameters": [
"--variant",
"ci/android_jit_release_x86",
"--type",
"java",
"--engine-capture-core-dump",
"--android-variant",
"ci/android_jit_release_x86"
]
}
]
}
},
{
"archives": [
Expand Down Expand Up @@ -99,26 +82,9 @@
"flutter/sky/dist:zip_old_location",
"flutter/lib/gpu/dist:zip_old_location",
"flutter/shell/platform/android:embedding_jars",
"flutter/shell/platform/android:abi_jars",
"flutter/shell/platform/android:robolectric_tests"
"flutter/shell/platform/android:abi_jars"
]
},
"tests": [
{
"language": "python3",
"name": "Host Tests for android_debug",
"script": "flutter/testing/run_tests.py",
"parameters": [
"--variant",
"ci/android_debug",
"--type",
"java",
"--engine-capture-core-dump",
"--android-variant",
"ci/android_debug"
]
}
]
}
},
{
"archives": [
Expand Down
94 changes: 94 additions & 0 deletions ci/builders/linux_unopt.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -269,6 +269,100 @@
]
}
]
},
{
"cas_archive": false,
"drone_dimensions": [
"device_type=none",
"os=Linux"
],
"gclient_variables": {
"use_rbe": true
},
"gn": [
"--target-dir",
"ci/android_jit_release_x86_test",
"--android",
"--android-cpu=x86",
"--runtime-mode=jit_release",
"--rbe",
"--no-goma"
],
"name": "ci/android_jit_release_x86_test",
"description": "Produces jit-release mode artifacts to target x86 Android from a Linux host.",
"ninja": {
"config": "ci/android_jit_release_x86_test",
"targets": [
"flutter",
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

so we're duplicating the compilation step here so that we can test from a different build?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes. Compilation is relatively cheap since it's likely to be rbe cache hits.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

SGTM

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm just trying to build a mental model, since I know at some places we use CAS to share artifacts.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Would it be fair to say that, were someone in the future to refactor the organization of all of this, these tests should depend on the compilation build, and get the artifacts via CAS?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Maybe. For the engine, the cases where that is an optimization might be a bit limited. AFAIU, it's only an improvement when there are multiple test suites we'd like to run in parallel on different machines.

"flutter/shell/platform/android:embedding_jars",
"flutter/shell/platform/android:abi_jars",
"flutter/shell/platform/android:robolectric_tests"
]
},
"tests": [
{
"language": "python3",
"name": "Host Tests for android_jit_release_x86_test",
"script": "flutter/testing/run_tests.py",
"parameters": [
"--variant",
"ci/android_jit_release_x86_test",
"--type",
"java",
"--engine-capture-core-dump",
"--android-variant",
"ci/android_jit_release_x86_test"
]
}
]
},
{
"cas_archive": false,
"drone_dimensions": [
"device_type=none",
"os=Linux"
],
"gclient_variables": {
"use_rbe": true
},
"gn": [
"--target-dir",
"ci/android_debug_test",
"--android",
"--android-cpu=arm",
"--no-lto",
"--rbe",
"--no-goma"
],
"name": "ci/android_debug_test",
"description": "Produces debug mode artifacts to target 32-bit arm Android from a Linux host.",
"ninja": {
"config": "ci/android_debug_test",
"targets": [
"flutter",
"flutter/sky/dist:zip_old_location",
"flutter/lib/gpu/dist:zip_old_location",
"flutter/shell/platform/android:embedding_jars",
"flutter/shell/platform/android:abi_jars",
"flutter/shell/platform/android:robolectric_tests"
]
},
"tests": [
{
"language": "python3",
"name": "Host Tests for android_debug_test",
"script": "flutter/testing/run_tests.py",
"parameters": [
"--variant",
"ci/android_debug_test",
"--type",
"java",
"--engine-capture-core-dump",
"--android-variant",
"ci/android_debug_test"
]
}
]
}
]
}