From f84800e7d3338e32fb496815558cb059e5666e4b Mon Sep 17 00:00:00 2001 From: Agi Sferro Date: Mon, 7 Jun 2021 21:49:06 +0000 Subject: [PATCH] Bug 1709640 - Label Android build jobs for 4.1. r=nalexander Not sure how it happened (probably copy-paste?) but a lot of Android jobs are marked for "Android 4.0" (API 14) or "Android 4.2" (API 18) while really they are all for Android 4.1 (API 16). This patch fixes that. Differential Revision: https://phabricator.services.mozilla.com/D117050 --- taskcluster/ci/build/android-stuff.yml | 2 +- taskcluster/ci/build/android.yml | 14 +++++++------- taskcluster/ci/instrumented-build/kind.yml | 4 ++-- taskcluster/ci/searchfox/kind.yml | 2 +- taskcluster/docs/platforms.rst | 17 ++++------------- 5 files changed, 15 insertions(+), 24 deletions(-) diff --git a/taskcluster/ci/build/android-stuff.yml b/taskcluster/ci/build/android-stuff.yml index 44248d73a505..b6822915c49a 100644 --- a/taskcluster/ci/build/android-stuff.yml +++ b/taskcluster/ci/build/android-stuff.yml @@ -14,7 +14,7 @@ android-geckoview-docs/opt: product: mobile job-name: android-geckoview-docs treeherder: - platform: android-4-0-armv7/opt + platform: android-4-1-armv7/opt kind: build tier: 2 symbol: A(gv-docs) diff --git a/taskcluster/ci/build/android.yml b/taskcluster/ci/build/android.yml index 4ad18574548f..aeead5ed4984 100644 --- a/taskcluster/ci/build/android.yml +++ b/taskcluster/ci/build/android.yml @@ -68,13 +68,13 @@ android-arm/debug: - linux64-sccache android-x86/opt: - description: "Android 4.2 x86 Opt" + description: "Android 4.1 x86 Opt" index: job-name: android-x86-opt attributes: enable-full-crashsymbols: true treeherder: - platform: android-4-2-x86/opt + platform: android-4-1-x86/opt symbol: B run-on-projects: ['integration'] worker-type: b-linux @@ -96,7 +96,7 @@ android-x86-fuzzing/debug: index: job-name: android-x86-fuzzing-debug treeherder: - platform: android-4-2-x86/debug + platform: android-4-1-x86/debug symbol: Bf worker-type: b-linux worker: @@ -115,7 +115,7 @@ android-x86-fuzzing/debug: skip-unless-expanded: null android-x86-shippable/opt: - description: "Android 4.2 x86 Shippable" + description: "Android 4.1 x86 Shippable" attributes: enable-full-crashsymbols: true shippable: true @@ -125,7 +125,7 @@ android-x86-shippable/opt: job-name: android-x86-opt type: android-shippable treeherder: - platform: android-4-2-x86-shippable/opt + platform: android-4-1-x86-shippable/opt symbol: B run-on-projects: ['release'] worker-type: b-linux @@ -409,13 +409,13 @@ android-arm-gcp/debug: android-x86-gcp/opt: - description: "Android 4.2 x86 Opt - built on GCP" + description: "Android 4.1 x86 Opt - built on GCP" index: job-name: android-x86-gcp-opt attributes: enable-full-crashsymbols: true treeherder: - platform: android-4-2-x86/opt + platform: android-4-1-x86/opt symbol: Bg tier: 3 worker-type: b-linux-gcp diff --git a/taskcluster/ci/instrumented-build/kind.yml b/taskcluster/ci/instrumented-build/kind.yml index e7f3419d1eba..91b925586620 100644 --- a/taskcluster/ci/instrumented-build/kind.yml +++ b/taskcluster/ci/instrumented-build/kind.yml @@ -136,13 +136,13 @@ jobs: - wasi-sysroot android-arm-shippable/opt: - description: "Android 4.0 Arm PGO instrumented" + description: "Android 4.1 Arm PGO instrumented" index: product: mobile job-name: instrumented-android-arm shipping-product: fennec treeherder: - platform: android-4-0-armv7/pgo + platform: android-4-1-armv7/pgo worker-type: b-linux worker: docker-image: {in-tree: android-build} diff --git a/taskcluster/ci/searchfox/kind.yml b/taskcluster/ci/searchfox/kind.yml index 2df7c378cadc..0d0cce69e9ac 100644 --- a/taskcluster/ci/searchfox/kind.yml +++ b/taskcluster/ci/searchfox/kind.yml @@ -157,7 +157,7 @@ jobs: index: job-name: android-armv7-searchfox-debug treeherder: - platform: android-4-0-armv7/debug + platform: android-4-1-armv7/debug worker-type: b-linux worker: docker-image: {in-tree: android-build} diff --git a/taskcluster/docs/platforms.rst b/taskcluster/docs/platforms.rst index 3db479e978c6..34b9d01b054b 100644 --- a/taskcluster/docs/platforms.rst +++ b/taskcluster/docs/platforms.rst @@ -59,20 +59,11 @@ Build Platforms Windows 2012 x64 DevEdition, , Windows MinGW, Tom Ritter, "| the Tor project uses MinGW; make sure we test that for them | Only runs on autoland, m-c and m-esr" - Android 4.0 API16+, , "| All Android jobs are for GeckoView. Fenix nightly uses m-c, Fenix beta => m-b, Fenix release => m-r and Focus uses m-r. + Android 4.1 API16+, , "| All Android jobs are for GeckoView. Fenix nightly uses m-c, Fenix beta => m-b, Fenix release => m-r and Focus uses m-r. | We run these tests in the CI to make sure that GeckoView tests do not regress." - Android 4.0 API16+ Beta, James Willcox (Snorp), To ship/test Android 4.1 on arm v7 CPU - Android 4.0 API16+ Release, , To ship/test Android 4.1 on arm v7 CPU - Android 4.0 API16+ GeckoView multi-arch fat AAR, , - Android 4.2 x86, , - Android 4.2 x86 Beta, , - Android 4.2 x86 Release, , - Android 4.2 x86, , - Android 4.2 x86 Beta, , - Android 4.2 x86 Release, , - Android 4.3 API16+, , - Android 4.3 API16+ Beta, , - Android 4.3 API16+ Release, , + Android 4.1 API16+ Beta, Agi Sferro, To ship/test Android 4.1 on arm v7 CPU + Android 4.1 API16+ Release, , To ship/test Android 4.1 on arm v7 CPU + Android 4.1 API16+ GeckoView multi-arch fat AAR, , Android 5.0 AArch64, , Android 5.0 AArch64 Beta, , Android 5.0 AArch64 Release, ,