Backed out changeset fb90c2538141 (bug 1407331) for build bustage

CLOSED TREE

MozReview-Commit-ID: 2Z6OSmyov6P
This commit is contained in:
Phil Ringnalda 2017-10-20 08:11:49 -07:00
Родитель 387fbfc8b6
Коммит 3e5273e92b
7 изменённых файлов: 26 добавлений и 23 удалений

Просмотреть файл

@ -19,8 +19,11 @@ if test "$OS_ARCH" = "WINNT"; then
if test "$MOZ_UPDATE_CHANNEL" = "nightly" -o \
"$MOZ_UPDATE_CHANNEL" = "nightly-try" -o \
"$MOZ_UPDATE_CHANNEL" = "aurora" -o \
"$MOZ_UPDATE_CHANNEL" = "aurora-dev" -o \
"$MOZ_UPDATE_CHANNEL" = "beta" -o \
"$MOZ_UPDATE_CHANNEL" = "beta-dev" -o \
"$MOZ_UPDATE_CHANNEL" = "release" -o \
"$MOZ_UPDATE_CHANNEL" = "release-dev"; then
if ! test "$MOZ_DEBUG"; then
MOZ_STUB_INSTALLER=1
fi

Просмотреть файл

@ -287,7 +287,7 @@ config = {
},
# 'holly': {},
'jamun': {
'update_channel': 'beta',
'update_channel': 'beta-dev',
'enable_release_promotion': 1,
'platform_overrides': {
'linux': {
@ -339,19 +339,19 @@ config = {
'update_channel': 'default',
},
'linux-devedition': {
"update_channel": "aurora",
"update_channel": "aurora-dev",
},
'linux64-devedition': {
"update_channel": "aurora",
"update_channel": "aurora-dev",
},
'macosx64-devedition': {
"update_channel": "aurora",
"update_channel": "aurora-dev",
},
'win32-devedition': {
"update_channel": "aurora",
"update_channel": "aurora-dev",
},
'win64-devedition': {
"update_channel": "aurora",
"update_channel": "aurora-dev",
},
},
'stage_server': 'upload.ffxbld.productdelivery.prod.mozaws.net',

Просмотреть файл

@ -23,15 +23,15 @@ config = {
"balrog_url": "http://54.90.211.22:9090",
"balrog_username": "balrog-stage-ffxbld",
"update_channels": {
"beta": {
"beta-dev": {
"version_regex": r"^(\d+\.\d+(b\d+)?)$",
"requires_mirrors": True,
# TODO - when we use a real repo, rename this file # s/MozJamun/Mozbeta/
# TODO - when we use a real repo, rename this file # s/MozJamun/MozBeta-dev/
"patcher_config": "mozJamun-branch-patcher2.cfg",
"update_verify_channel": "beta-localtest",
"update_verify_channel": "beta-dev-localtest",
"mar_channel_ids": [],
"channel_names": ["beta", "beta-localtest", "beta-cdntest"],
"rules_to_update": ["firefox-beta-cdntest", "firefox-beta-localtest"],
"channel_names": ["beta-dev", "beta-dev-localtest", "beta-dev-cdntest"],
"rules_to_update": ["firefox-beta-dev-cdntest", "firefox-beta-dev-localtest"],
"publish_rules": [32],
"bz2_blob_suffix": "-bz2",
"bz2_rules_to_update": ["firefox-beta-cdntest-bz2", "firefox-beta-localtest-bz2"],

Просмотреть файл

@ -23,16 +23,16 @@ config = {
"balrog_url": "http://54.90.211.22:9090",
"balrog_username": "balrog-stage-ffxbld",
"update_channels": {
"beta": {
"beta-dev": {
"version_regex": r"^(\d+\.\d+(b\d+)?)$",
"requires_mirrors": False,
"patcher_config": "mozDate-branch-patcher2.cfg",
"update_verify_channel": "beta-localtest",
"update_verify_channel": "beta-dev-localtest",
"mar_channel_ids": [
"firefox-mozilla-beta", "firefox-mozilla-release",
"firefox-mozilla-beta-dev", "firefox-mozilla-release-dev",
],
"channel_names": ["beta", "beta-localtest", "beta-cdntest"],
"rules_to_update": ["firefox-beta-cdntest", "firefox-beta-localtest"],
"channel_names": ["beta-dev", "beta-dev-localtest", "beta-dev-cdntest"],
"rules_to_update": ["firefox-beta-dev-cdntest", "firefox-beta-dev-localtest"],
"publish_rules": [32],
"schedule_asap": True,
"bz2_blob_suffix": "-bz2",
@ -41,14 +41,14 @@ config = {
"complete_mar_filename_pattern": '%s-%s.bz2.complete.mar',
"complete_mar_bouncer_product_pattern": '%s-%s-complete-bz2',
},
"release": {
"release-dev": {
"version_regex": r"^\d+\.\d+(\.\d+)?$",
"requires_mirrors": True,
"patcher_config": "mozJamun-branch-patcher2.cfg",
"update_verify_channel": "release-localtest",
"update_verify_channel": "release-dev-localtest",
"mar_channel_ids": [],
"channel_names": ["release", "release-localtest", "release-cdntest"],
"rules_to_update": ["firefox-release-cdntest", "firefox-release-localtest"],
"channel_names": ["release-dev", "release-dev-localtest", "release-dev-cdntest"],
"rules_to_update": ["firefox-release-dev-cdntest", "firefox-release-dev-localtest"],
"publish_rules": [145],
"bz2_blob_suffix": "-bz2",
"bz2_rules_to_update": ["firefox-release-cdntest-bz2", "firefox-release-localtest-bz2"],

Просмотреть файл

@ -1,7 +1,7 @@
config = {
"branch": "jamun",
"nightly_build": True,
"update_channel": "beta",
"update_channel": "beta-dev",
# l10n
"hg_l10n_base": "https://hg.mozilla.org/l10n-central",

Просмотреть файл

@ -1,7 +1,7 @@
config = {
"branch": "date",
"nightly_build": True,
"update_channel": "aurora", # devedition uses aurora based branding
"update_channel": "aurora-dev", # devedition uses aurora based branding
# l10n
"hg_l10n_base": "https://hg.mozilla.org/l10n-central",

Просмотреть файл

@ -1,7 +1,7 @@
config = {
"branch": "jamun",
"nightly_build": True,
"update_channel": "release",
"update_channel": "release-dev",
# l10n
"hg_l10n_base": "https://hg.mozilla.org/l10n-central",