Bug 1546320 - Create mozconfigs for Fennec beta builds r=RyanVM
authorJohan Lorenzo <jlorenzo@mozilla.com>
Tue, 30 Apr 2019 13:57:48 +0000
changeset 530746 486f55e81c5708dfe3da9b346097d2909720e2d5
parent 530745 ac14ff604f811c88ff0cac70ce9858abd2539044
child 530747 86910675df1395b31f809fc954ad044d61e1ebd7
push id11265
push userffxbld-merge
push dateMon, 13 May 2019 10:53:39 +0000
treeherdermozilla-beta@77e0fe8dbdd3 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersRyanVM
bugs1546320
milestone68.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1546320 - Create mozconfigs for Fennec beta builds r=RyanVM Create mozconfigs for Fennec beta builds. This also prevents mergeday scripts from modifying nightly mozconfigs on beta Differential Revision: https://phabricator.services.mozilla.com/D29350
mobile/android/config/mozconfigs/android-aarch64/beta
mobile/android/config/mozconfigs/android-aarch64/debug-beta
mobile/android/config/mozconfigs/android-api-16/beta
mobile/android/config/mozconfigs/android-api-16/debug-beta
mobile/android/config/mozconfigs/android-x86/beta
mobile/android/config/mozconfigs/android-x86/debug-beta
mobile/android/config/mozconfigs/android-x86_64/beta
mobile/android/config/mozconfigs/android-x86_64/debug-beta
testing/mozharness/configs/builds/releng_sub_android_configs/64_aarch64_beta.py
testing/mozharness/configs/builds/releng_sub_android_configs/64_aarch64_beta_debug.py
testing/mozharness/configs/builds/releng_sub_android_configs/64_api_16_beta.py
testing/mozharness/configs/builds/releng_sub_android_configs/64_api_16_beta_debug.py
testing/mozharness/configs/builds/releng_sub_android_configs/64_x86_64_beta.py
testing/mozharness/configs/builds/releng_sub_android_configs/64_x86_64_beta_debug.py
testing/mozharness/configs/builds/releng_sub_android_configs/64_x86_beta.py
testing/mozharness/configs/builds/releng_sub_android_configs/64_x86_beta_debug.py
testing/mozharness/configs/builds/releng_sub_android_configs/64_x86_debug.py
testing/mozharness/configs/merge_day/central_to_beta.py
testing/mozharness/mozharness/mozilla/building/buildbase.py
copy from mobile/android/config/mozconfigs/android-aarch64/nightly
copy to mobile/android/config/mozconfigs/android-aarch64/beta
--- a/mobile/android/config/mozconfigs/android-aarch64/nightly
+++ b/mobile/android/config/mozconfigs/android-aarch64/beta
@@ -1,15 +1,15 @@
 . "$topsrcdir/mobile/android/config/mozconfigs/common"
 
 # Android
 ac_add_options --with-android-min-sdk=21
 ac_add_options --target=aarch64-linux-android
 
-ac_add_options --with-branding=mobile/android/branding/nightly
+ac_add_options --with-branding=mobile/android/branding/beta
 
 export AR="$topsrcdir/clang/bin/llvm-ar"
 export NM="$topsrcdir/clang/bin/llvm-nm"
 export RANLIB="$topsrcdir/clang/bin/llvm-ranlib"
 
 export MOZ_LTO=1
 
 export MOZILLA_OFFICIAL=1
copy from mobile/android/config/mozconfigs/android-aarch64/debug
copy to mobile/android/config/mozconfigs/android-aarch64/debug-beta
--- a/mobile/android/config/mozconfigs/android-aarch64/debug
+++ b/mobile/android/config/mozconfigs/android-aarch64/debug-beta
@@ -6,11 +6,11 @@ ac_add_options --enable-debug
 # Android
 ac_add_options --with-android-min-sdk=21
 ac_add_options --target=aarch64-linux-android
 
 export MOZILLA_OFFICIAL=1
 export MOZ_TELEMETRY_REPORTING=1
 export MOZ_ANDROID_POCKET
 
-ac_add_options --with-branding=mobile/android/branding/nightly
+ac_add_options --with-branding=mobile/android/branding/beta
 
 . "$topsrcdir/mobile/android/config/mozconfigs/common.override"
copy from mobile/android/config/mozconfigs/android-api-16/nightly
copy to mobile/android/config/mozconfigs/android-api-16/beta
--- a/mobile/android/config/mozconfigs/android-api-16/nightly
+++ b/mobile/android/config/mozconfigs/android-api-16/beta
@@ -4,17 +4,17 @@
 # Warning: Before increasing the with-android-min-sdk value, please note several places in and out
 # of tree have to be changed. Otherwise, places like Treeherder or archive.mozilla.org will
 # advertise a bad API level. This may confuse people. As an example, please look at bug 1384482.
 # If you think you can't handle the whole set of changes, please reach out to the Release
 # Engineering team.
 ac_add_options --with-android-min-sdk=16
 ac_add_options --target=arm-linux-androideabi
 
-ac_add_options --with-branding=mobile/android/branding/nightly
+ac_add_options --with-branding=mobile/android/branding/beta
 
 export MOZILLA_OFFICIAL=1
 export MOZ_TELEMETRY_REPORTING=1
 export MOZ_ANDROID_MMA=1
 export MOZ_ANDROID_POCKET=1
 
 export AR="$topsrcdir/clang/bin/llvm-ar"
 export NM="$topsrcdir/clang/bin/llvm-nm"
copy from mobile/android/config/mozconfigs/android-api-16/debug
copy to mobile/android/config/mozconfigs/android-api-16/debug-beta
--- a/mobile/android/config/mozconfigs/android-api-16/debug
+++ b/mobile/android/config/mozconfigs/android-api-16/debug-beta
@@ -10,11 +10,11 @@ ac_add_options --enable-debug
 # If you think you can't handle the whole set of changes, please reach out to the Release
 # Engineering team.
 ac_add_options --with-android-min-sdk=16
 ac_add_options --target=arm-linux-androideabi
 
 export MOZILLA_OFFICIAL=1
 export MOZ_TELEMETRY_REPORTING=1
 
-ac_add_options --with-branding=mobile/android/branding/nightly
+ac_add_options --with-branding=mobile/android/branding/beta
 
 . "$topsrcdir/mobile/android/config/mozconfigs/common.override"
copy from mobile/android/config/mozconfigs/android-x86/nightly
copy to mobile/android/config/mozconfigs/android-x86/beta
--- a/mobile/android/config/mozconfigs/android-x86/nightly
+++ b/mobile/android/config/mozconfigs/android-x86/beta
@@ -3,17 +3,17 @@
 # Warning: Before increasing the with-android-min-sdk value, please note several places in and out
 # of tree have to be changed. Otherwise, places like Treeherder or archive.mozilla.org will
 # advertise a bad API level. This may confuse people. As an example, please look at bug 1384482.
 # If you think you can't handle the whole set of changes, please reach out to the Release
 # Engineering team.
 ac_add_options --target=i686-linux-android
 ac_add_options --with-android-min-sdk=16
 
-ac_add_options --with-branding=mobile/android/branding/nightly
+ac_add_options --with-branding=mobile/android/branding/beta
 
 export MOZILLA_OFFICIAL=1
 export MOZ_TELEMETRY_REPORTING=1
 export MOZ_ANDROID_POCKET=1
 
 export AR="$topsrcdir/clang/bin/llvm-ar"
 export NM="$topsrcdir/clang/bin/llvm-nm"
 export RANLIB="$topsrcdir/clang/bin/llvm-ranlib"
copy from mobile/android/config/mozconfigs/android-x86/debug
copy to mobile/android/config/mozconfigs/android-x86/debug-beta
--- a/mobile/android/config/mozconfigs/android-x86/debug
+++ b/mobile/android/config/mozconfigs/android-x86/debug-beta
@@ -11,11 +11,11 @@ ac_add_options --enable-debug
 # Engineering team.
 ac_add_options --target=i686-linux-android
 ac_add_options --with-android-min-sdk=16
 
 export MOZILLA_OFFICIAL=1
 export MOZ_TELEMETRY_REPORTING=1
 export MOZ_ANDROID_POCKET=1
 
-ac_add_options --with-branding=mobile/android/branding/nightly
+ac_add_options --with-branding=mobile/android/branding/beta
 
 . "$topsrcdir/mobile/android/config/mozconfigs/common.override"
copy from mobile/android/config/mozconfigs/android-x86_64/nightly
copy to mobile/android/config/mozconfigs/android-x86_64/beta
--- a/mobile/android/config/mozconfigs/android-x86_64/nightly
+++ b/mobile/android/config/mozconfigs/android-x86_64/beta
@@ -1,15 +1,15 @@
 . "$topsrcdir/mobile/android/config/mozconfigs/common"
 
 # Android
 ac_add_options --with-android-min-sdk=21
 ac_add_options --target=x86_64-linux-android
 
-ac_add_options --with-branding=mobile/android/branding/nightly
+ac_add_options --with-branding=mobile/android/branding/beta
 
 export AR="$topsrcdir/clang/bin/llvm-ar"
 export NM="$topsrcdir/clang/bin/llvm-nm"
 export RANLIB="$topsrcdir/clang/bin/llvm-ranlib"
 
 export MOZ_LTO=1
 
 export MOZILLA_OFFICIAL=1
copy from mobile/android/config/mozconfigs/android-x86_64/debug
copy to mobile/android/config/mozconfigs/android-x86_64/debug-beta
--- a/mobile/android/config/mozconfigs/android-x86_64/debug
+++ b/mobile/android/config/mozconfigs/android-x86_64/debug-beta
@@ -6,11 +6,11 @@ ac_add_options --enable-debug
 # Android
 ac_add_options --with-android-min-sdk=21
 ac_add_options --target=x86_64-linux-android
 
 export MOZILLA_OFFICIAL=1
 export MOZ_TELEMETRY_REPORTING=1
 export MOZ_ANDROID_POCKET
 
-ac_add_options --with-branding=mobile/android/branding/nightly
+ac_add_options --with-branding=mobile/android/branding/beta
 
 . "$topsrcdir/mobile/android/config/mozconfigs/common.override"
new file mode 100644
--- /dev/null
+++ b/testing/mozharness/configs/builds/releng_sub_android_configs/64_aarch64_beta.py
@@ -0,0 +1,5 @@
+config = {
+    'stage_platform': 'android-aarch64',
+    'src_mozconfig': 'mobile/android/config/mozconfigs/android-aarch64/beta',
+    'multi_locale_config_platform': 'android',
+}
new file mode 100644
--- /dev/null
+++ b/testing/mozharness/configs/builds/releng_sub_android_configs/64_aarch64_beta_debug.py
@@ -0,0 +1,6 @@
+config = {
+    'stage_platform': 'android-aarch64-debug',
+    'src_mozconfig': 'mobile/android/config/mozconfigs/android-aarch64/debug-beta',
+    'multi_locale_config_platform': 'android',
+    'debug_build': True,
+}
new file mode 100644
--- /dev/null
+++ b/testing/mozharness/configs/builds/releng_sub_android_configs/64_api_16_beta.py
@@ -0,0 +1,5 @@
+config = {
+    'stage_platform': 'android-api-16',
+    'src_mozconfig': 'mobile/android/config/mozconfigs/android-api-16/beta',
+    'multi_locale_config_platform': 'android',
+}
new file mode 100644
--- /dev/null
+++ b/testing/mozharness/configs/builds/releng_sub_android_configs/64_api_16_beta_debug.py
@@ -0,0 +1,6 @@
+config = {
+    'stage_platform': 'android-api-16-debug',
+    'src_mozconfig': 'mobile/android/config/mozconfigs/android-api-16/debug-beta',
+    'multi_locale_config_platform': 'android',
+    'debug_build': True,
+}
new file mode 100644
--- /dev/null
+++ b/testing/mozharness/configs/builds/releng_sub_android_configs/64_x86_64_beta.py
@@ -0,0 +1,5 @@
+config = {
+    'stage_platform': 'android-x86_64',
+    'src_mozconfig': 'mobile/android/config/mozconfigs/android-x86_64/beta',
+    'multi_locale_config_platform': 'android',
+}
new file mode 100644
--- /dev/null
+++ b/testing/mozharness/configs/builds/releng_sub_android_configs/64_x86_64_beta_debug.py
@@ -0,0 +1,6 @@
+config = {
+    'stage_platform': 'android-x86_64-debug',
+    'src_mozconfig': 'mobile/android/config/mozconfigs/android-x86_64/debug-beta',
+    'multi_locale_config_platform': 'android',
+    'debug_build': True,
+}
new file mode 100644
--- /dev/null
+++ b/testing/mozharness/configs/builds/releng_sub_android_configs/64_x86_beta.py
@@ -0,0 +1,4 @@
+config = {
+    'stage_platform': 'android-x86',
+    'src_mozconfig': 'mobile/android/config/mozconfigs/android-x86/beta',
+}
new file mode 100644
--- /dev/null
+++ b/testing/mozharness/configs/builds/releng_sub_android_configs/64_x86_beta_debug.py
@@ -0,0 +1,5 @@
+config = {
+    'stage_platform': 'android-x86-debug',
+    'src_mozconfig': 'mobile/android/config/mozconfigs/android-x86/debug-beta',
+    'debug_build': True,
+}
new file mode 100644
--- /dev/null
+++ b/testing/mozharness/configs/builds/releng_sub_android_configs/64_x86_debug.py
@@ -0,0 +1,6 @@
+config = {
+    'stage_platform': 'android-x86-debug',
+    'src_mozconfig': 'mobile/android/config/mozconfigs/android-x86/debug',
+    'multi_locale_config_platform': 'android',
+    'debug_build': True,
+}
--- a/testing/mozharness/configs/merge_day/central_to_beta.py
+++ b/testing/mozharness/configs/merge_day/central_to_beta.py
@@ -6,26 +6,16 @@ config = {
     "log_name": "central_to_beta",
     "version_files": [
         {"file": "browser/config/version.txt", "suffix": ""},
         {"file": "browser/config/version_display.txt", "suffix": "b1"},
         {"file": "config/milestone.txt", "suffix": ""},
     ],
     "replacements": [
         # File, from, to
-        ("{}{}".format(d, f),
-        "ac_add_options --with-branding=mobile/android/branding/nightly",
-        "ac_add_options --with-branding=mobile/android/branding/beta")
-        for d in ["mobile/android/config/mozconfigs/android-aarch64/",
-                  "mobile/android/config/mozconfigs/android-api-16/",
-                  "mobile/android/config/mozconfigs/android-x86/",
-                  "mobile/android/config/mozconfigs/android-x86_64/"]
-        for f in ["debug", "nightly"]
-    ] + [
-        # File, from, to
         (f, "ac_add_options --with-branding=browser/branding/nightly",
         "ac_add_options --enable-official-branding")
         for f in ["browser/config/mozconfigs/linux32/l10n-mozconfig",
                   "browser/config/mozconfigs/linux64/l10n-mozconfig",
                   "browser/config/mozconfigs/win32/l10n-mozconfig",
                   "browser/config/mozconfigs/win64/l10n-mozconfig",
                   "browser/config/mozconfigs/win64-aarch64/l10n-mozconfig",
                   "browser/config/mozconfigs/macosx64/l10n-mozconfig"]
--- a/testing/mozharness/mozharness/mozilla/building/buildbase.py
+++ b/testing/mozharness/mozharness/mozilla/building/buildbase.py
@@ -348,32 +348,41 @@ class BuildOptionParser(object):
         'stat-and-debug': 'builds/releng_sub_%s_configs/%s_stat_and_debug.py',
         'code-coverage-debug': 'builds/releng_sub_%s_configs/%s_code_coverage_debug.py',
         'code-coverage-opt': 'builds/releng_sub_%s_configs/%s_code_coverage_opt.py',
         'source': 'builds/releng_sub_%s_configs/%s_source.py',
         'noopt-debug': 'builds/releng_sub_%s_configs/%s_noopt_debug.py',
         'api-16-gradle-dependencies':
             'builds/releng_sub_%s_configs/%s_api_16_gradle_dependencies.py',
         'api-16': 'builds/releng_sub_%s_configs/%s_api_16.py',
+        'api-16-beta': 'builds/releng_sub_%s_configs/%s_api_16_beta.py',
+        'api-16-beta-debug': 'builds/releng_sub_%s_configs/%s_api_16_beta_debug.py',
         'api-16-debug': 'builds/releng_sub_%s_configs/%s_api_16_debug.py',
         'api-16-debug-ccov': 'builds/releng_sub_%s_configs/%s_api_16_debug_ccov.py',
         'api-16-debug-searchfox': 'builds/releng_sub_%s_configs/%s_api_16_debug_searchfox.py',
         'api-16-gradle': 'builds/releng_sub_%s_configs/%s_api_16_gradle.py',
         'api-16-profile-generate': 'builds/releng_sub_%s_configs/%s_api_16_profile_generate.py',
         'api-16-profile-use': 'builds/releng_sub_%s_configs/%s_api_16_profile_use.py',
         'api-16-without-google-play-services':
             'builds/releng_sub_%s_configs/%s_api_16_without_google_play_services.py',
         'rusttests': 'builds/releng_sub_%s_configs/%s_rusttests.py',
         'rusttests-debug': 'builds/releng_sub_%s_configs/%s_rusttests_debug.py',
         'x86': 'builds/releng_sub_%s_configs/%s_x86.py',
+        'x86-beta': 'builds/releng_sub_%s_configs/%s_x86_beta.py',
+        'x86-beta-debug': 'builds/releng_sub_%s_configs/%s_x86_beta_debug.py',
+        'x86-debug': 'builds/releng_sub_%s_configs/%s_x86_debug.py',
         'x86-fuzzing-debug': 'builds/releng_sub_%s_configs/%s_x86_fuzzing_debug.py',
         'x86_64': 'builds/releng_sub_%s_configs/%s_x86_64.py',
+        'x86_64-beta': 'builds/releng_sub_%s_configs/%s_x86_64_beta.py',
+        'x86_64-beta-debug': 'builds/releng_sub_%s_configs/%s_x86_64_beta_debug.py',
         'x86_64-debug': 'builds/releng_sub_%s_configs/%s_x86_64_debug.py',
         'api-16-partner-sample1': 'builds/releng_sub_%s_configs/%s_api_16_partner_sample1.py',
         'aarch64': 'builds/releng_sub_%s_configs/%s_aarch64.py',
+        'aarch64-beta': 'builds/releng_sub_%s_configs/%s_aarch64_beta.py',
+        'aarch64-beta-debug': 'builds/releng_sub_%s_configs/%s_aarch64_beta_debug.py',
         'aarch64-debug': 'builds/releng_sub_%s_configs/%s_aarch64_debug.py',
         'android-test': 'builds/releng_sub_%s_configs/%s_test.py',
         'android-test-ccov': 'builds/releng_sub_%s_configs/%s_test_ccov.py',
         'android-checkstyle': 'builds/releng_sub_%s_configs/%s_checkstyle.py',
         'android-api-lint': 'builds/releng_sub_%s_configs/%s_api_lint.py',
         'android-lint': 'builds/releng_sub_%s_configs/%s_lint.py',
         'android-findbugs': 'builds/releng_sub_%s_configs/%s_findbugs.py',
         'android-geckoview-docs': 'builds/releng_sub_%s_configs/%s_geckoview_docs.py',