Bug 1285608 - Part 3a: Don't overload "api-15-opt" build_type. r=dustin
To handle |mach try --artifact|, we check the build_type. (See
earlier patches in series.) However, there are multiple "builds" with
build_type "api-15-opt". I think this was always questionable; the
reason I did it at the time is that these Android tasks are
"build-alikes" that do almost all of a build, but don't produce build
artifacts for the Task Cluster Index. Therefore, I figured they would
be "api-15-opt" builds, just like the main build.
I think it makes more sense to disambiguate these "build-alikes" using
the build_type. We could, of course, use a different field... but I
see no reason to restrict the set of build_type values, so here we
are.
MozReview-Commit-ID: JD5INhocOsd
--- a/testing/mozharness/configs/builds/releng_sub_android_configs/64_api_15_artifact.py
+++ b/testing/mozharness/configs/builds/releng_sub_android_configs/64_api_15_artifact.py
@@ -1,8 +1,8 @@
config = {
'base_name': 'Android armv7 API 15+ %(branch)s Artifact build',
'stage_platform': 'android-api-15',
- 'build_type': 'api-15-opt',
+ 'build_type': 'api-15-opt-artifact',
'src_mozconfig': 'mobile/android/config/mozconfigs/android-api-15/artifact',
'tooltool_manifest_src': 'mobile/android/config/tooltool-manifests/android/releng.manifest',
'multi_locale_config_platform': 'android',
}
--- a/testing/mozharness/configs/builds/releng_sub_android_configs/64_api_15_gradle_artifact.py
+++ b/testing/mozharness/configs/builds/releng_sub_android_configs/64_api_15_gradle_artifact.py
@@ -1,12 +1,12 @@
config = {
'base_name': 'Android armv7 API 15+ %(branch)s Gradle Artifact build',
'stage_platform': 'android-api-15-gradle',
- 'build_type': 'api-15-gradle',
+ 'build_type': 'api-15-gradle-artifact',
'src_mozconfig': 'mobile/android/config/mozconfigs/android-api-15-gradle/artifact',
'tooltool_manifest_src': 'mobile/android/config/tooltool-manifests/android/releng.manifest',
'multi_locale_config_platform': 'android',
# It's not obvious, but postflight_build is after packaging, so the Gecko
# binaries are in the object directory, ready to be packaged into the
# GeckoView AAR.
'postflight_build_mach_commands': [
['gradle',
--- a/testing/mozharness/configs/builds/releng_sub_android_configs/64_api_15_gradle_dependencies.py
+++ b/testing/mozharness/configs/builds/releng_sub_android_configs/64_api_15_gradle_dependencies.py
@@ -1,12 +1,12 @@
config = {
'base_name': 'Android armv7 API 15+ Gradle dependencies %(branch)s',
'stage_platform': 'android-api-15-gradle-dependencies',
- 'build_type': 'api-15-opt',
+ 'build_type': 'api-15-gradle-dependencies',
'src_mozconfig': 'mobile/android/config/mozconfigs/android-api-15-gradle-dependencies/nightly',
'tooltool_manifest_src': 'mobile/android/config/tooltool-manifests/android-gradle-dependencies/releng.manifest',
'multi_locale_config_platform': 'android',
'postflight_build_mach_commands': [
['gradle',
'assembleAutomationRelease',
'assembleAutomationDebug',
'assembleAutomationDebugAndroidTest',
--- a/testing/mozharness/configs/builds/releng_sub_android_configs/64_checkstyle.py
+++ b/testing/mozharness/configs/builds/releng_sub_android_configs/64_checkstyle.py
@@ -1,12 +1,12 @@
config = {
'base_name': 'Android checkstyle %(branch)s',
'stage_platform': 'android-checkstyle',
- 'build_type': 'api-15-opt',
+ 'build_type': 'api-15-checkstyle',
'src_mozconfig': 'mobile/android/config/mozconfigs/android-api-15-frontend/nightly',
'tooltool_manifest_src': 'mobile/android/config/tooltool-manifests/android-frontend/releng.manifest',
'multi_locale_config_platform': 'android',
'postflight_build_mach_commands': [
['gradle', 'app:checkstyle'],
],
'artifact_flag_build_variant_in_try': None, # There's no artifact equivalent.
}
--- a/testing/mozharness/configs/builds/releng_sub_android_configs/64_lint.py
+++ b/testing/mozharness/configs/builds/releng_sub_android_configs/64_lint.py
@@ -1,12 +1,12 @@
config = {
'base_name': 'Android lint %(branch)s',
'stage_platform': 'android-lint',
- 'build_type': 'api-15-opt',
+ 'build_type': 'api-15-lint',
'src_mozconfig': 'mobile/android/config/mozconfigs/android-api-15-frontend/nightly',
'tooltool_manifest_src': 'mobile/android/config/tooltool-manifests/android-frontend/releng.manifest',
'multi_locale_config_platform': 'android',
'postflight_build_mach_commands': [
['gradle', 'app:lintAutomationDebug'],
],
'artifact_flag_build_variant_in_try': None, # There's no artifact equivalent.
}
--- a/testing/mozharness/configs/builds/releng_sub_android_configs/64_test.py
+++ b/testing/mozharness/configs/builds/releng_sub_android_configs/64_test.py
@@ -1,12 +1,12 @@
config = {
'base_name': 'Android armv7 unit tests %(branch)s',
'stage_platform': 'android-test',
- 'build_type': 'api-15-opt',
+ 'build_type': 'api-15-test',
'src_mozconfig': 'mobile/android/config/mozconfigs/android-api-15-frontend/nightly',
'tooltool_manifest_src': 'mobile/android/config/tooltool-manifests/android-frontend/releng.manifest',
'multi_locale_config_platform': 'android',
'postflight_build_mach_commands': [
['gradle', 'app:testAutomationDebugUnitTest'],
],
'artifact_flag_build_variant_in_try': None, # There's no artifact equivalent.
}