Bug 1536522 - Let mergeday scripts handle missing Android mozconfigs r=aki,nalexander
authorJohan Lorenzo <jlorenzo@mozilla.com>
Fri, 22 Mar 2019 13:06:13 +0000
changeset 465672 a19986b12bd6c401fab6e3de19235063ff2f067f
parent 465671 d89b9c049fa32a37407c84488ddd6e728f34cd08
child 465673 b6940071e197ddb5bdfb982b8139fd220d3e38d0
push id35744
push userapavel@mozilla.com
push dateFri, 22 Mar 2019 16:44:08 +0000
treeherdermozilla-central@e66a2b59914d [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersaki, nalexander
bugs1536522
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 1536522 - Let mergeday scripts handle missing Android mozconfigs r=aki,nalexander Let mergeday scripts handle missing Android mozconfigs Differential Revision: https://phabricator.services.mozilla.com/D24343
testing/mozharness/configs/merge_day/beta_to_release.py
testing/mozharness/configs/merge_day/central_to_beta.py
--- a/testing/mozharness/configs/merge_day/beta_to_release.py
+++ b/testing/mozharness/configs/merge_day/beta_to_release.py
@@ -10,19 +10,20 @@ config = {
             "dst": "browser/config/version_display.txt",
         },
     ],
     "replacements": [
         # File, from, to
         ("{}{}".format(d, f),
         "ac_add_options --with-branding=mobile/android/branding/beta",
         "ac_add_options --with-branding=mobile/android/branding/official")
-        for d in ["mobile/android/config/mozconfigs/android-api-16/",
+        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-aarch64/"]
+                  "mobile/android/config/mozconfigs/android-x86_64/"]
         for f in ["debug", "nightly"]
     ] + [
         # File, from, to
         ("browser/confvars.sh",
          "ACCEPTED_MAR_CHANNEL_IDS=firefox-mozilla-beta,firefox-mozilla-release",
          "ACCEPTED_MAR_CHANNEL_IDS=firefox-mozilla-release"),
         ("browser/confvars.sh",
          "MAR_CHANNEL_ID=firefox-mozilla-beta",
--- a/testing/mozharness/configs/merge_day/central_to_beta.py
+++ b/testing/mozharness/configs/merge_day/central_to_beta.py
@@ -9,19 +9,20 @@ config = {
         {"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-api-16/",
+        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-aarch64/"]
+                  "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",