diff options
Diffstat (limited to 'testing/mozharness/configs/merge_day')
6 files changed, 336 insertions, 0 deletions
diff --git a/testing/mozharness/configs/merge_day/aurora_to_beta.py b/testing/mozharness/configs/merge_day/aurora_to_beta.py new file mode 100644 index 000000000..dc1fc4c83 --- /dev/null +++ b/testing/mozharness/configs/merge_day/aurora_to_beta.py @@ -0,0 +1,83 @@ +import os + +ABS_WORK_DIR = os.path.join(os.getcwd(), "build") + +config = { + "log_name": "aurora_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/aurora", + "ac_add_options --with-branding=mobile/android/branding/beta") + for d in ["mobile/android/config/mozconfigs/android-api-15/", + "mobile/android/config/mozconfigs/android-x86/"] + for f in ["debug", "nightly", "l10n-nightly"] + ] + [ + # File, from, to + ("{}/{}".format(d, f), + "ac_add_options --with-branding=browser/branding/aurora", + "ac_add_options --with-branding=browser/branding/nightly") + for d in ["browser/config/mozconfigs/linux32", + "browser/config/mozconfigs/linux64", + "browser/config/mozconfigs/win32", + "browser/config/mozconfigs/win64", + "browser/config/mozconfigs/macosx64"] + for f in ["debug", "nightly"] + ] + [ + # File, from, to + (f, "ac_add_options --with-branding=browser/branding/aurora", + "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/macosx-universal/l10n-mozconfig", + "browser/config/mozconfigs/macosx64/l10n-mozconfig"] + ] + [ + ("browser/config/mozconfigs/macosx-universal/nightly", + "ac_add_options --with-branding=browser/branding/aurora", + "ac_add_options --with-branding=browser/branding/nightly"), + ("browser/confvars.sh", + "ACCEPTED_MAR_CHANNEL_IDS=firefox-mozilla-aurora", + "ACCEPTED_MAR_CHANNEL_IDS=firefox-mozilla-beta,firefox-mozilla-release"), + ("browser/confvars.sh", + "MAR_CHANNEL_ID=firefox-mozilla-aurora", + "MAR_CHANNEL_ID=firefox-mozilla-beta"), + ("browser/config/mozconfigs/whitelist", + "ac_add_options --with-branding=browser/branding/aurora", + "ac_add_options --with-branding=browser/branding/nightly"), + ] + [ + ("build/mozconfig.common", + "MOZ_REQUIRE_SIGNING=${MOZ_REQUIRE_SIGNING-0}", + "MOZ_REQUIRE_SIGNING=${MOZ_REQUIRE_SIGNING-1}"), + ("build/mozconfig.common", + "# Disable enforcing that add-ons are signed by the trusted root", + "# Enable enforcing that add-ons are signed by the trusted root") + ], + + "vcs_share_base": os.path.join(ABS_WORK_DIR, 'hg-shared'), + # "hg_share_base": None, + "tools_repo_url": "https://hg.mozilla.org/build/tools", + "tools_repo_branch": "default", + "from_repo_url": "ssh://hg.mozilla.org/releases/mozilla-aurora", + "to_repo_url": "ssh://hg.mozilla.org/releases/mozilla-beta", + + "base_tag": "FIREFOX_BETA_%(major_version)s_BASE", + "end_tag": "FIREFOX_BETA_%(major_version)s_END", + + "migration_behavior": "aurora_to_beta", + + "virtualenv_modules": [ + "requests==2.8.1", + ], + + "post_merge_builders": [], + "post_merge_nightly_branches": [ + # No nightlies on mozilla-beta + ], +} diff --git a/testing/mozharness/configs/merge_day/beta_to_release.py b/testing/mozharness/configs/merge_day/beta_to_release.py new file mode 100644 index 000000000..0316272bf --- /dev/null +++ b/testing/mozharness/configs/merge_day/beta_to_release.py @@ -0,0 +1,53 @@ +import os + +ABS_WORK_DIR = os.path.join(os.getcwd(), "build") + +config = { + "log_name": "beta_to_release", + "copy_files": [ + { + "src": "browser/config/version.txt", + "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-15/", + "mobile/android/config/mozconfigs/android-x86/"] + for f in ["debug", "nightly", "l10n-nightly", "l10n-release", "release"] + ] + [ + # 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", + "MAR_CHANNEL_ID=firefox-mozilla-release"), + ], + + "vcs_share_base": os.path.join(ABS_WORK_DIR, 'hg-shared'), + # "hg_share_base": None, + "tools_repo_url": "https://hg.mozilla.org/build/tools", + "tools_repo_branch": "default", + "from_repo_url": "ssh://hg.mozilla.org/releases/mozilla-beta", + "to_repo_url": "ssh://hg.mozilla.org/releases/mozilla-release", + + "base_tag": "FIREFOX_RELEASE_%(major_version)s_BASE", + "end_tag": "FIREFOX_RELEASE_%(major_version)s_END", + + "migration_behavior": "beta_to_release", + "require_remove_locales": False, + "pull_all_branches": True, + + "virtualenv_modules": [ + "requests==2.8.1", + ], + + "post_merge_builders": [], + "post_merge_nightly_branches": [ + # No nightlies on mozilla-release + ], +} diff --git a/testing/mozharness/configs/merge_day/bump_esr.py b/testing/mozharness/configs/merge_day/bump_esr.py new file mode 100644 index 000000000..48ab2e9de --- /dev/null +++ b/testing/mozharness/configs/merge_day/bump_esr.py @@ -0,0 +1,24 @@ +import os + +ABS_WORK_DIR = os.path.join(os.getcwd(), "build") +config = { + "vcs_share_base": os.path.join(ABS_WORK_DIR, 'hg-shared'), + "log_name": "bump_esr", + "version_files": [ + {"file": "browser/config/version.txt", "suffix": ""}, + {"file": "browser/config/version_display.txt", "suffix": ""}, + {"file": "config/milestone.txt", "suffix": ""}, + ], + "tools_repo_url": "https://hg.mozilla.org/build/tools", + "tools_repo_branch": "default", + "to_repo_url": "ssh://hg.mozilla.org/releases/mozilla-esr52", + + "migration_behavior": "bump_second_digit", + "require_remove_locales": False, + "requires_head_merge": False, + "default_actions": [ + "clean-repos", + "pull", + "bump_second_digit" + ], +} diff --git a/testing/mozharness/configs/merge_day/central_to_aurora.py b/testing/mozharness/configs/merge_day/central_to_aurora.py new file mode 100644 index 000000000..36347f667 --- /dev/null +++ b/testing/mozharness/configs/merge_day/central_to_aurora.py @@ -0,0 +1,100 @@ +import os + +ABS_WORK_DIR = os.path.join(os.getcwd(), "build") +config = { + "log_name": "central_to_aurora", + "version_files": [ + {"file": "browser/config/version.txt", "suffix": ""}, + {"file": "browser/config/version_display.txt", "suffix": ""}, + {"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/aurora") + for d in ["mobile/android/config/mozconfigs/android-api-15/", + "mobile/android/config/mozconfigs/android-x86/"] + for f in ["debug", "nightly", "l10n-nightly"] + ] + [ + # File, from, to + ("{}/{}".format(d, f), + "ac_add_options --with-branding=browser/branding/nightly", + "ac_add_options --with-branding=browser/branding/aurora") + for d in ["browser/config/mozconfigs/linux32", + "browser/config/mozconfigs/linux64", + "browser/config/mozconfigs/win32", + "browser/config/mozconfigs/win64", + "browser/config/mozconfigs/macosx64"] + for f in ["debug", "nightly", "l10n-mozconfig"] + ] + [ + # File, from, to + ("{}/l10n-nightly".format(d), + "ac_add_options --with-l10n-base=../../l10n-central", + "ac_add_options --with-l10n-base=..") + for d in ["mobile/android/config/mozconfigs/android-api-15/", + "mobile/android/config/mozconfigs/android-x86/"] + ] + [ + # File, from, to + (f, "ac_add_options --enable-profiling", "") for f in + ["mobile/android/config/mozconfigs/android-api-15/nightly", + "mobile/android/config/mozconfigs/android-x86/nightly", + "browser/config/mozconfigs/linux32/nightly", + "browser/config/mozconfigs/linux64/nightly", + "browser/config/mozconfigs/macosx-universal/nightly", + "browser/config/mozconfigs/win32/nightly", + "browser/config/mozconfigs/win64/nightly"] + ] + [ + # File, from, to + ("browser/confvars.sh", + "ACCEPTED_MAR_CHANNEL_IDS=firefox-mozilla-central", + "ACCEPTED_MAR_CHANNEL_IDS=firefox-mozilla-aurora"), + ("browser/confvars.sh", + "MAR_CHANNEL_ID=firefox-mozilla-central", + "MAR_CHANNEL_ID=firefox-mozilla-aurora"), + ("browser/config/mozconfigs/macosx-universal/nightly", + "ac_add_options --with-branding=browser/branding/nightly", + "ac_add_options --with-branding=browser/branding/aurora"), + ("browser/config/mozconfigs/macosx-universal/l10n-mozconfig", + "ac_add_options --with-branding=browser/branding/nightly", + "ac_add_options --with-branding=browser/branding/aurora"), + ("browser/config/mozconfigs/whitelist", + "ac_add_options --with-branding=browser/branding/nightly", + "ac_add_options --with-branding=browser/branding/aurora"), + ], + "locale_files": [ + "browser/locales/shipped-locales", + "browser/locales/all-locales", + "mobile/android/locales/maemo-locales", + "mobile/android/locales/all-locales" + ], + + "vcs_share_base": os.path.join(ABS_WORK_DIR, 'hg-shared'), + # "hg_share_base": None, + "tools_repo_url": "https://hg.mozilla.org/build/tools", + "tools_repo_branch": "default", + "from_repo_url": "ssh://hg.mozilla.org/mozilla-central", + "to_repo_url": "ssh://hg.mozilla.org/releases/mozilla-aurora", + + "base_tag": "FIREFOX_AURORA_%(major_version)s_BASE", + "end_tag": "FIREFOX_AURORA_%(major_version)s_END", + + "migration_behavior": "central_to_aurora", + + "balrog_rules_to_lock": [ + 8, # Fennec aurora channel + 10, # Firefox aurora channel + 18, # MetroFirefox aurora channel + ], + "balrog_credentials_file": "oauth.txt", + + "virtualenv_modules": [ + "requests==2.8.1", + ], + + "post_merge_builders": [], + "post_merge_nightly_branches": [ + "mozilla-central", + "mozilla-aurora", + ], +} diff --git a/testing/mozharness/configs/merge_day/release_to_esr.py b/testing/mozharness/configs/merge_day/release_to_esr.py new file mode 100644 index 000000000..358c583da --- /dev/null +++ b/testing/mozharness/configs/merge_day/release_to_esr.py @@ -0,0 +1,54 @@ +import os + +ABS_WORK_DIR = os.path.join(os.getcwd(), "build") +NEW_ESR_REPO = "ssh://hg.mozilla.org/releases/mozilla-esr52" +OLD_ESR_REPO = "https://hg.mozilla.org/releases/mozilla-esr45" +OLD_ESR_CHANGESET = "d2d75f526882" + +config = { + "log_name": "relese_to_esr", + "version_files": [ + {"file": "browser/config/version.txt", "suffix": ""}, + {"file": "browser/config/version_display.txt", "suffix": ""}, + {"file": "config/milestone.txt", "suffix": ""}, + ], + "replacements": [ + # File, from, to + ("browser/confvars.sh", + "ACCEPTED_MAR_CHANNEL_IDS=firefox-mozilla-release", + "ACCEPTED_MAR_CHANNEL_IDS=firefox-mozilla-esr"), + ("browser/confvars.sh", + "MAR_CHANNEL_ID=firefox-mozilla-release", + "MAR_CHANNEL_ID=firefox-mozilla-esr"), + ("build/mozconfig.common", + "# Enable checking that add-ons are signed by the trusted root", + "# Disable checking that add-ons are signed by the trusted root"), + ("build/mozconfig.common", + "MOZ_ADDON_SIGNING=${MOZ_ADDON_SIGNING-1}", + "MOZ_ADDON_SIGNING=${MOZ_ADDON_SIGNING-0}"), + ("build/mozconfig.common", + "# Enable enforcing that add-ons are signed by the trusted root", + "# Disable enforcing that add-ons are signed by the trusted root"), + ("build/mozconfig.common", + "MOZ_REQUIRE_SIGNING=${MOZ_REQUIRE_SIGNING-1}", + "MOZ_REQUIRE_SIGNING=${MOZ_REQUIRE_SIGNING-0}"), + ], + "vcs_share_base": os.path.join(ABS_WORK_DIR, 'hg-shared'), + # "hg_share_base": None, + "tools_repo_url": "https://hg.mozilla.org/build/tools", + "tools_repo_branch": "default", + "from_repo_url": "ssh://hg.mozilla.org/releases/mozilla-release", + "to_repo_url": NEW_ESR_REPO, + + "base_tag": "FIREFOX_ESR_%(major_version)s_BASE", + "end_tag": "FIREFOX_ESR_%(major_version)s_END", + + "migration_behavior": "release_to_esr", + "require_remove_locales": False, + "transplant_patches": [ + {"repo": OLD_ESR_REPO, + "changeset": OLD_ESR_CHANGESET}, + ], + "requires_head_merge": False, + "pull_all_branches": True, +} diff --git a/testing/mozharness/configs/merge_day/staging_beta_migration.py b/testing/mozharness/configs/merge_day/staging_beta_migration.py new file mode 100644 index 000000000..9b6ac198e --- /dev/null +++ b/testing/mozharness/configs/merge_day/staging_beta_migration.py @@ -0,0 +1,22 @@ +# Use this script in conjunction with aurora_to_beta.py. +# mozharness/scripts/merge_day/gecko_migration.py -c \ +# mozharness/configs/merge_day/aurora_to_beta.py -c +# mozharness/configs/merge_day/staging_beta_migration.py ... +import os + +ABS_WORK_DIR = os.path.join(os.getcwd(), "build") + +config = { + "log_name": "staging_beta", + + "vcs_share_base": os.path.join(ABS_WORK_DIR, 'hg-shared'), + "tools_repo_url": "https://hg.mozilla.org/build/tools", + "tools_repo_branch": "default", + "from_repo_url": "ssh://hg.mozilla.org/releases/mozilla-aurora", + "to_repo_url": "ssh://hg.mozilla.org/users/stage-ffxbld/mozilla-beta", + + "base_tag": "FIREFOX_BETA_%(major_version)s_BASE", + "end_tag": "FIREFOX_BETA_%(major_version)s_END", + + "migration_behavior": "aurora_to_beta", +} |