diff --git a/infra/config/commit-queue.cfg b/infra/config/commit-queue.cfg index 662f3994ed..1c703c7022 100644 --- a/infra/config/commit-queue.cfg +++ b/infra/config/commit-queue.cfg @@ -34,9 +34,18 @@ config_groups { name: "webrtc-internal/g3.webrtc-internal.try/internal_compile_lite" owner_whitelist_group: "project-webrtc-internal-tryjob-access" } + builders { + name: "webrtc/try/android_arm64_rel" + } + builders { + name: "webrtc/try/android_arm_dbg" + } builders { name: "webrtc/try/android_arm_more_configs" } + builders { + name: "webrtc/try/android_arm_rel" + } builders { name: "webrtc/try/android_chromium_compile" } @@ -198,9 +207,18 @@ config_groups { dry_run_access_list: "project-webrtc-tryjob-access" } tryjob { + builders { + name: "webrtc/try/android_arm64_rel" + } + builders { + name: "webrtc/try/android_arm_dbg" + } builders { name: "webrtc/try/android_arm_more_configs" } + builders { + name: "webrtc/try/android_arm_rel" + } builders { name: "webrtc/try/android_compile_arm64_rel" } diff --git a/infra/config/config.star b/infra/config/config.star index 1d9d806050..74b0bad3ac 100755 --- a/infra/config/config.star +++ b/infra/config/config.star @@ -705,13 +705,9 @@ ios_builder, ios_try_job = normal_builder_factory( android_builder("Android32 (M Nexus5X)(dbg)", "Android|arm|dbg") android_try_job("android_compile_arm_dbg", cq = None) - -# TODO(b/257964487): Return to CQ -android_try_job("android_arm_dbg", cq = None) +android_try_job("android_arm_dbg") android_builder("Android32 (M Nexus5X)", "Android|arm|rel") - -# TODO(b/257964487): Return to CQ -android_try_job("android_arm_rel", cq = None) +android_try_job("android_arm_rel") android_builder("Android32 Builder arm", "Android|arm|size", perf_cat = "Android|arm|Builder|", prioritized = True) android_try_job("android_compile_arm_rel") perf_builder("Perf Android32 (M Nexus5)", "Android|arm|Tester|M Nexus5", triggered_by = ["Android32 Builder arm"]) @@ -719,9 +715,7 @@ perf_builder("Perf Android32 (M AOSP Nexus6)", "Android|arm|Tester|M AOSP Nexus6 android_try_job("android_compile_arm64_dbg", cq = None) android_try_job("android_arm64_dbg", cq = None) android_builder("Android64 (M Nexus5X)", "Android|arm64|rel") - -# TODO(b/257964487): Return to CQ -android_try_job("android_arm64_rel", cq = None) +android_try_job("android_arm64_rel") android_builder("Android64 Builder arm64", "Android|arm64|size", perf_cat = "Android|arm64|Builder|", prioritized = True) perf_builder("Perf Android64 (M Nexus5X)", "Android|arm64|Tester|M Nexus5X", triggered_by = ["Android64 Builder arm64"]) perf_builder("Perf Android64 (O Pixel2)", "Android|arm64|Tester|O Pixel2", triggered_by = ["Android64 Builder arm64"])