Bug 1254438 - Remove hg bundle generation from merge script, r=rail DONTBUILD
authorNick Thomas <nthomas@mozilla.com>
Wed, 09 Mar 2016 09:36:18 +1300
changeset 338416 5e3325cc17582630d630c8e40f65ed91322fd8a9
parent 338415 e0b2fffc136004c1f61ec104823bd316cbb5b71f
child 338417 96018aec0a709ed554bd0f6a3d4e6bba28ed0b8b
push id12513
push userbmo:mh+mozilla@glandium.org
push dateWed, 09 Mar 2016 05:09:40 +0000
reviewersrail
bugs1254438
milestone47.0a1
Bug 1254438 - Remove hg bundle generation from merge script, r=rail DONTBUILD
testing/mozharness/configs/merge_day/aurora_to_beta.py
testing/mozharness/configs/merge_day/beta_to_release.py
testing/mozharness/configs/merge_day/central_to_aurora.py
testing/mozharness/scripts/merge_day/gecko_migration.py
--- a/testing/mozharness/configs/merge_day/aurora_to_beta.py
+++ b/testing/mozharness/configs/merge_day/aurora_to_beta.py
@@ -62,15 +62,13 @@ config = {
     "end_tag": "FIREFOX_BETA_%(major_version)s_END",
 
     "migration_behavior": "aurora_to_beta",
 
     "virtualenv_modules": [
         "requests==2.8.1",
     ],
 
-    "post_merge_builders": [
-        "mozilla-beta hg bundle",
-    ],
+    "post_merge_builders": [],
     "post_merge_nightly_branches": [
         # No nightlies on mozilla-beta
     ],
 }
--- a/testing/mozharness/configs/merge_day/beta_to_release.py
+++ b/testing/mozharness/configs/merge_day/beta_to_release.py
@@ -38,15 +38,13 @@ config = {
     "migration_behavior": "beta_to_release",
     "require_remove_locales": False,
     "pull_all_branches": True,
 
     "virtualenv_modules": [
         "requests==2.8.1",
     ],
 
-    "post_merge_builders": [
-        "mozilla-release hg bundle",
-    ],
+    "post_merge_builders": [],
     "post_merge_nightly_branches": [
         # No nightlies on mozilla-release
     ],
 }
--- a/testing/mozharness/configs/merge_day/central_to_aurora.py
+++ b/testing/mozharness/configs/merge_day/central_to_aurora.py
@@ -89,17 +89,14 @@ config = {
         106,  # Fennec api-9 aurora channel
     ],
     "balrog_credentials_file": "oauth.txt",
 
     "virtualenv_modules": [
         "requests==2.8.1",
     ],
 
-    "post_merge_builders": [
-        "mozilla-aurora hg bundle",
-        "mozilla-central hg bundle",
-    ],
+    "post_merge_builders": [],
     "post_merge_nightly_branches": [
         "mozilla-central",
         "mozilla-aurora",
     ],
 }
--- a/testing/mozharness/scripts/merge_day/gecko_migration.py
+++ b/testing/mozharness/scripts/merge_day/gecko_migration.py
@@ -509,17 +509,17 @@ class GeckoMigration(MercurialScript, Ba
         There are two different types of things we trigger:
         1) Nightly builds ("post_merge_nightly_branches" in the config).
            These are triggered with buildapi's nightly build endpoint to avoid
            duplicating all of the nightly builder names into the gecko
            migration mozharness configs. (Which would surely get out of date
            very quickly).
         2) Arbitrary builders ("post_merge_builders"). These are additional
            builders to trigger that aren't part of the nightly builder set.
-           For example: hg bundle generation builders.
+           Previous example: hg bundle generation builders.
         """
         dirs = self.query_abs_dirs()
         branch = self.config["to_repo_url"].rstrip("/").split("/")[-1]
         revision = self.query_to_revision()
         # Horrible hack because our internal buildapi interface doesn't let us
         # actually do anything. Need to use the public one w/ auth.
         username = raw_input("LDAP Username: ")
         password = getpass(prompt="LDAP Password: ")