Remove android sdk dependency for arm64 tests
Android sdk and openjdk packages of mac_arm64 are not ready yet. This removes the test `build_aar_module_test` and corresponding dependencies to unblock tests coverage.
Bug: https://github.com/flutter/flutter/issues/98532, https://github.com/flutter/flutter/issues/87508
Change-Id: Ib962adb7c74c163d8ce66a3cec49edc018f00f5a
Reviewed-on: https://flutter-review.googlesource.com/c/infra/+/27061
Reviewed-by: Jenn Magder <magder@google.com>
Commit-Queue: Keyong Han <keyonghan@google.com>
diff --git a/config/devicelab_staging_config.star b/config/devicelab_staging_config.star
index 089caf7..530d3ea 100644
--- a/config/devicelab_staging_config.star
+++ b/config/devicelab_staging_config.star
@@ -312,6 +312,8 @@
dimensions = {"device_os": "none"},
)
+ # TODO(keyonghan): add "build_aar_module_test" when arm64 android sdk is ready in cipd,
+ # https://github.com/flutter/flutter/issues/98532#issuecomment-1040893602
mac_arm64_tasks = [
"hot_mode_dev_cycle_macos_target__benchmark",
"flutter_gallery_ios__compile",
@@ -327,7 +329,6 @@
"ios_app_with_extensions_test",
"ios_content_validation_test",
"macos_chrome_dev_mode",
- "build_aar_module_test",
]
for task in mac_arm64_tasks:
@@ -338,7 +339,7 @@
triggered_by = [trigger_name],
triggering_policy = triggering_policy,
properties = {
- "dependencies": [{"dependency": "xcode"}, {"dependency": "gems"}, {"dependency": "android_sdk", "version": "version:29.0"}, {"dependency": "open_jdk"}],
+ "dependencies": [{"dependency": "xcode"}, {"dependency": "gems"}],
"task_name": task,
"git_branch": DEFAULT_BRANCH,
"use_cas": True,
diff --git a/config/generated/flutter/luci/cr-buildbucket.cfg b/config/generated/flutter/luci/cr-buildbucket.cfg
index b6d5f27..beeee87 100644
--- a/config/generated/flutter/luci/cr-buildbucket.cfg
+++ b/config/generated/flutter/luci/cr-buildbucket.cfg
@@ -107645,90 +107645,6 @@
}
}
builders {
- name: "Mac_arm64_staging build_aar_module_test"
- swarming_host: "chromium-swarm.appspot.com"
- dimensions: "device_os:none"
- dimensions: "mac_model:Macmini9,1"
- dimensions: "os:Mac-11"
- dimensions: "pool:luci.flutter.staging"
- exe {
- cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
- cipd_version: "refs/heads/main"
- cmd: "luciexe"
- }
- properties:
- '{'
- ' "$flutter/osx_sdk": {'
- ' "sdk_version": "12c33"'
- ' },'
- ' "$fuchsia/goma": {'
- ' "server": "rbe-prod1.endpoints.fuchsia-infra-goma-prod.cloud.goog"'
- ' },'
- ' "$kitchen": {'
- ' "emulate_gce": true'
- ' },'
- ' "$recipe_engine/isolated": {'
- ' "server": "https://isolateserver.appspot.com"'
- ' },'
- ' "$recipe_engine/swarming": {'
- ' "server": "https://chromium-swarm.appspot.com"'
- ' },'
- ' "clobber": false,'
- ' "dependencies": ['
- ' {'
- ' "dependency": "xcode"'
- ' },'
- ' {'
- ' "dependency": "gems"'
- ' },'
- ' {'
- ' "dependency": "android_sdk",'
- ' "version": "version:29.0"'
- ' },'
- ' {'
- ' "dependency": "open_jdk"'
- ' }'
- ' ],'
- ' "git_branch": "master",'
- ' "gold_tryjob": false,'
- ' "goma_jobs": "200",'
- ' "mastername": "client.flutter",'
- ' "recipe": "devicelab/devicelab_drone",'
- ' "task_name": "build_aar_module_test",'
- ' "upload_metrics": true,'
- ' "upload_packages": true,'
- ' "use_cas": true'
- '}'
- execution_timeout_secs: 3600
- caches {
- name: "builder_mac_devicelab_staging"
- path: "builder"
- }
- caches {
- name: "flutter_sdk"
- path: "flutter sdk"
- }
- caches {
- name: "osx_sdk"
- path: "osx_sdk"
- }
- caches {
- name: "pub_cache"
- path: ".pub-cache"
- }
- caches {
- name: "xcode_binary"
- path: "xcode_binary"
- }
- build_numbers: YES
- service_account: "flutter-staging-builder@chops-service-accounts.iam.gserviceaccount.com"
- task_template_canary_percentage {}
- experiments {
- key: "luci.recipes.use_python3"
- value: 100
- }
- }
- builders {
name: "Mac_arm64_staging build_ios_framework_module_test"
swarming_host: "chromium-swarm.appspot.com"
dimensions: "device_os:none"
@@ -107764,13 +107680,6 @@
' },'
' {'
' "dependency": "gems"'
- ' },'
- ' {'
- ' "dependency": "android_sdk",'
- ' "version": "version:29.0"'
- ' },'
- ' {'
- ' "dependency": "open_jdk"'
' }'
' ],'
' "git_branch": "master",'
@@ -107848,13 +107757,6 @@
' },'
' {'
' "dependency": "gems"'
- ' },'
- ' {'
- ' "dependency": "android_sdk",'
- ' "version": "version:29.0"'
- ' },'
- ' {'
- ' "dependency": "open_jdk"'
' }'
' ],'
' "git_branch": "master",'
@@ -107932,13 +107834,6 @@
' },'
' {'
' "dependency": "gems"'
- ' },'
- ' {'
- ' "dependency": "android_sdk",'
- ' "version": "version:29.0"'
- ' },'
- ' {'
- ' "dependency": "open_jdk"'
' }'
' ],'
' "git_branch": "master",'
@@ -108016,13 +107911,6 @@
' },'
' {'
' "dependency": "gems"'
- ' },'
- ' {'
- ' "dependency": "android_sdk",'
- ' "version": "version:29.0"'
- ' },'
- ' {'
- ' "dependency": "open_jdk"'
' }'
' ],'
' "git_branch": "master",'
@@ -108100,13 +107988,6 @@
' },'
' {'
' "dependency": "gems"'
- ' },'
- ' {'
- ' "dependency": "android_sdk",'
- ' "version": "version:29.0"'
- ' },'
- ' {'
- ' "dependency": "open_jdk"'
' }'
' ],'
' "git_branch": "master",'
@@ -108184,13 +108065,6 @@
' },'
' {'
' "dependency": "gems"'
- ' },'
- ' {'
- ' "dependency": "android_sdk",'
- ' "version": "version:29.0"'
- ' },'
- ' {'
- ' "dependency": "open_jdk"'
' }'
' ],'
' "git_branch": "master",'
@@ -108268,13 +108142,6 @@
' },'
' {'
' "dependency": "gems"'
- ' },'
- ' {'
- ' "dependency": "android_sdk",'
- ' "version": "version:29.0"'
- ' },'
- ' {'
- ' "dependency": "open_jdk"'
' }'
' ],'
' "git_branch": "master",'
@@ -108352,13 +108219,6 @@
' },'
' {'
' "dependency": "gems"'
- ' },'
- ' {'
- ' "dependency": "android_sdk",'
- ' "version": "version:29.0"'
- ' },'
- ' {'
- ' "dependency": "open_jdk"'
' }'
' ],'
' "git_branch": "master",'
@@ -108436,13 +108296,6 @@
' },'
' {'
' "dependency": "gems"'
- ' },'
- ' {'
- ' "dependency": "android_sdk",'
- ' "version": "version:29.0"'
- ' },'
- ' {'
- ' "dependency": "open_jdk"'
' }'
' ],'
' "git_branch": "master",'
@@ -108520,13 +108373,6 @@
' },'
' {'
' "dependency": "gems"'
- ' },'
- ' {'
- ' "dependency": "android_sdk",'
- ' "version": "version:29.0"'
- ' },'
- ' {'
- ' "dependency": "open_jdk"'
' }'
' ],'
' "git_branch": "master",'
@@ -108604,13 +108450,6 @@
' },'
' {'
' "dependency": "gems"'
- ' },'
- ' {'
- ' "dependency": "android_sdk",'
- ' "version": "version:29.0"'
- ' },'
- ' {'
- ' "dependency": "open_jdk"'
' }'
' ],'
' "git_branch": "master",'
@@ -108688,13 +108527,6 @@
' },'
' {'
' "dependency": "gems"'
- ' },'
- ' {'
- ' "dependency": "android_sdk",'
- ' "version": "version:29.0"'
- ' },'
- ' {'
- ' "dependency": "open_jdk"'
' }'
' ],'
' "git_branch": "master",'
@@ -108772,13 +108604,6 @@
' },'
' {'
' "dependency": "gems"'
- ' },'
- ' {'
- ' "dependency": "android_sdk",'
- ' "version": "version:29.0"'
- ' },'
- ' {'
- ' "dependency": "open_jdk"'
' }'
' ],'
' "git_branch": "master",'
@@ -108856,13 +108681,6 @@
' },'
' {'
' "dependency": "gems"'
- ' },'
- ' {'
- ' "dependency": "android_sdk",'
- ' "version": "version:29.0"'
- ' },'
- ' {'
- ' "dependency": "open_jdk"'
' }'
' ],'
' "git_branch": "master",'
diff --git a/config/generated/flutter/luci/luci-milo.cfg b/config/generated/flutter/luci/luci-milo.cfg
index d18a468..81b8eca 100644
--- a/config/generated/flutter/luci/luci-milo.cfg
+++ b/config/generated/flutter/luci/luci-milo.cfg
@@ -348,11 +348,6 @@
short_name: "mcdm"
}
builders {
- name: "buildbucket/luci.flutter.staging/Mac_arm64_staging build_aar_module_test"
- category: "Mac_arm64"
- short_name: "bamt"
- }
- builders {
name: "buildbucket/luci.flutter.staging/Linux_android_staging android_obfuscate_test"
category: "Linux_android"
short_name: "aot"
diff --git a/config/generated/flutter/luci/luci-scheduler.cfg b/config/generated/flutter/luci/luci-scheduler.cfg
index 8fb230f..ca5f3d3 100644
--- a/config/generated/flutter/luci/luci-scheduler.cfg
+++ b/config/generated/flutter/luci/luci-scheduler.cfg
@@ -12068,21 +12068,6 @@
}
}
job {
- id: "Mac_arm64_staging build_aar_module_test"
- realm: "staging"
- acl_sets: "staging"
- triggering_policy {
- kind: GREEDY_BATCHING
- max_concurrent_invocations: 1
- max_batch_size: 20
- }
- buildbucket {
- server: "cr-buildbucket.appspot.com"
- bucket: "staging"
- builder: "Mac_arm64_staging build_aar_module_test"
- }
-}
-job {
id: "Mac_arm64_staging build_ios_framework_module_test"
realm: "staging"
acl_sets: "staging"
@@ -18627,7 +18612,6 @@
triggers: "Mac_android_staging integration_test_test"
triggers: "Mac_android_staging integration_ui_frame_number"
triggers: "Mac_android_staging run_release_test"
- triggers: "Mac_arm64_staging build_aar_module_test"
triggers: "Mac_arm64_staging build_ios_framework_module_test"
triggers: "Mac_arm64_staging flutter_gallery_ios__compile"
triggers: "Mac_arm64_staging hello_world_android__compile"
