Bug 1407331 - Staging releases: Remove *-dev update channel r=bhearsum
☠☠ backed out by a1d57c259c8e ☠ ☠
authorJohan Lorenzo <jlorenzo@mozilla.com>
Fri, 20 Oct 2017 16:41:29 +0200
changeset 440637 fb90c25381415788c85b679f729c9094148a0ea3
parent 440636 573274df0d0eeceb57afda9082ec5cbb69fdd691
child 440638 9231586e6c1e658bed1523f6475d386d3f5f7cb0
push id1618
push userCallek@gmail.com
push dateThu, 11 Jan 2018 17:45:48 +0000
treeherdermozilla-release@882ca853e05a [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersbhearsum
bugs1407331
milestone58.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 1407331 - Staging releases: Remove *-dev update channel r=bhearsum MozReview-Commit-ID: 2hevL6EQjmq
browser/confvars.sh
testing/mozharness/configs/builds/branch_specifics.py
testing/mozharness/configs/releases/dev_updates_firefox_beta.py
testing/mozharness/configs/releases/dev_updates_firefox_release.py
testing/mozharness/configs/single_locale/dev-mozilla-beta.py
testing/mozharness/configs/single_locale/dev-mozilla-beta_devedition.py
testing/mozharness/configs/single_locale/dev-mozilla-release.py
--- a/browser/confvars.sh
+++ b/browser/confvars.sh
@@ -14,21 +14,18 @@ if test "$OS_ARCH" = "WINNT" -o \
 fi
 
 if test "$OS_ARCH" = "WINNT"; then
   MOZ_MAINTENANCE_SERVICE=1
   if ! test "$HAVE_64BIT_BUILD"; 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
     fi
   fi
 fi
 
 if test "$NIGHTLY_BUILD"; then
--- a/testing/mozharness/configs/builds/branch_specifics.py
+++ b/testing/mozharness/configs/builds/branch_specifics.py
@@ -282,17 +282,17 @@ config = {
         'stage_server': 'upload.ffxbld.productdelivery.prod.mozaws.net',
     },
     'fig': {},
     'graphics': {
         'stage_server': 'upload.ffxbld.productdelivery.prod.mozaws.net',
     },
     # 'holly': {},
     'jamun': {
-        'update_channel': 'beta-dev',
+        'update_channel': 'beta',
         'enable_release_promotion': 1,
         'platform_overrides': {
             'linux': {
                 'src_mozconfig': 'browser/config/mozconfigs/linux32/release',
             },
             'linux-debug': {
                 'update_channel': 'default',
             },
@@ -334,29 +334,29 @@ config = {
             },
             'win64': {
                 'src_mozconfig': 'browser/config/mozconfigs/win64/release',
             },
             'win64-debug': {
                 'update_channel': 'default',
             },
             'linux-devedition': {
-                "update_channel": "aurora-dev",
+                "update_channel": "aurora",
             },
             'linux64-devedition': {
-                "update_channel": "aurora-dev",
+                "update_channel": "aurora",
             },
             'macosx64-devedition': {
-                "update_channel": "aurora-dev",
+                "update_channel": "aurora",
             },
             'win32-devedition': {
-                "update_channel": "aurora-dev",
+                "update_channel": "aurora",
             },
             'win64-devedition': {
-                "update_channel": "aurora-dev",
+                "update_channel": "aurora",
             },
         },
         'stage_server': 'upload.ffxbld.productdelivery.prod.mozaws.net',
     },
     'larch': {
         'stage_server': 'upload.ffxbld.productdelivery.prod.mozaws.net',
     },
     # 'maple': {},
--- a/testing/mozharness/configs/releases/dev_updates_firefox_beta.py
+++ b/testing/mozharness/configs/releases/dev_updates_firefox_beta.py
@@ -18,25 +18,25 @@ config = {
     "ssh_key": "~/.ssh/ffxbld_rsa",
     "archive_domain": "ftp.stage.mozaws.net",
     "archive_prefix": "https://ftp.stage.mozaws.net/pub",
     "previous_archive_prefix": "https://archive.mozilla.org/pub",
     "download_domain": "download.mozilla.org",
     "balrog_url": "http://54.90.211.22:9090",
     "balrog_username": "balrog-stage-ffxbld",
     "update_channels": {
-        "beta-dev": {
+        "beta": {
             "version_regex": r"^(\d+\.\d+(b\d+)?)$",
             "requires_mirrors": True,
-            # TODO - when we use a real repo, rename this file # s/MozJamun/MozBeta-dev/
+            # TODO - when we use a real repo, rename this file # s/MozJamun/Mozbeta/
             "patcher_config": "mozJamun-branch-patcher2.cfg",
-            "update_verify_channel": "beta-dev-localtest",
+            "update_verify_channel": "beta-localtest",
             "mar_channel_ids": [],
-            "channel_names": ["beta-dev", "beta-dev-localtest", "beta-dev-cdntest"],
-            "rules_to_update": ["firefox-beta-dev-cdntest", "firefox-beta-dev-localtest"],
+            "channel_names": ["beta", "beta-localtest", "beta-cdntest"],
+            "rules_to_update": ["firefox-beta-cdntest", "firefox-beta-localtest"],
             "publish_rules": [32],
             "bz2_blob_suffix": "-bz2",
             "bz2_rules_to_update": ["firefox-beta-cdntest-bz2", "firefox-beta-localtest-bz2"],
             "bz2_publish_rules": [652],
             "complete_mar_filename_pattern": '%s-%s.bz2.complete.mar',
             "complete_mar_bouncer_product_pattern": '%s-%s-complete-bz2',
         }
     },
--- a/testing/mozharness/configs/releases/dev_updates_firefox_release.py
+++ b/testing/mozharness/configs/releases/dev_updates_firefox_release.py
@@ -18,42 +18,42 @@ config = {
     "ssh_key": "~/.ssh/ffxbld_rsa",
     "archive_domain": "ftp.stage.mozaws.net",
     "archive_prefix": "https://ftp.stage.mozaws.net/pub",
     "previous_archive_prefix": "https://archive.mozilla.org/pub",
     "download_domain": "download.mozilla.org",
     "balrog_url": "http://54.90.211.22:9090",
     "balrog_username": "balrog-stage-ffxbld",
     "update_channels": {
-        "beta-dev": {
+        "beta": {
             "version_regex": r"^(\d+\.\d+(b\d+)?)$",
             "requires_mirrors": False,
             "patcher_config": "mozDate-branch-patcher2.cfg",
-            "update_verify_channel": "beta-dev-localtest",
+            "update_verify_channel": "beta-localtest",
             "mar_channel_ids": [
-                "firefox-mozilla-beta-dev", "firefox-mozilla-release-dev",
+                "firefox-mozilla-beta", "firefox-mozilla-release",
             ],
-            "channel_names": ["beta-dev", "beta-dev-localtest", "beta-dev-cdntest"],
-            "rules_to_update": ["firefox-beta-dev-cdntest", "firefox-beta-dev-localtest"],
+            "channel_names": ["beta", "beta-localtest", "beta-cdntest"],
+            "rules_to_update": ["firefox-beta-cdntest", "firefox-beta-localtest"],
             "publish_rules": [32],
             "schedule_asap": True,
             "bz2_blob_suffix": "-bz2",
             "bz2_rules_to_update": ["firefox-release-cdntest-bz2", "firefox-release-localtest-bz2"],
             "bz2_publish_rules": [624],
             "complete_mar_filename_pattern": '%s-%s.bz2.complete.mar',
             "complete_mar_bouncer_product_pattern": '%s-%s-complete-bz2',
         },
-        "release-dev": {
+        "release": {
             "version_regex": r"^\d+\.\d+(\.\d+)?$",
             "requires_mirrors": True,
             "patcher_config": "mozJamun-branch-patcher2.cfg",
-            "update_verify_channel": "release-dev-localtest",
+            "update_verify_channel": "release-localtest",
             "mar_channel_ids": [],
-            "channel_names": ["release-dev", "release-dev-localtest", "release-dev-cdntest"],
-            "rules_to_update": ["firefox-release-dev-cdntest", "firefox-release-dev-localtest"],
+            "channel_names": ["release", "release-localtest", "release-cdntest"],
+            "rules_to_update": ["firefox-release-cdntest", "firefox-release-localtest"],
             "publish_rules": [145],
             "bz2_blob_suffix": "-bz2",
             "bz2_rules_to_update": ["firefox-release-cdntest-bz2", "firefox-release-localtest-bz2"],
             "bz2_publish_rules": [624],
             "complete_mar_filename_pattern": '%s-%s.bz2.complete.mar',
             "complete_mar_bouncer_product_pattern": '%s-%s-complete-bz2',
         },
     },
--- a/testing/mozharness/configs/single_locale/dev-mozilla-beta.py
+++ b/testing/mozharness/configs/single_locale/dev-mozilla-beta.py
@@ -1,12 +1,12 @@
 config = {
     "branch": "jamun",
     "nightly_build": True,
-    "update_channel": "beta-dev",
+    "update_channel": "beta",
 
     # l10n
     "hg_l10n_base": "https://hg.mozilla.org/l10n-central",
 
     # repositories
     # staging beta dev releases use jamun repo for now
     "mozilla_dir": "jamun",
     "repos": [{
--- a/testing/mozharness/configs/single_locale/dev-mozilla-beta_devedition.py
+++ b/testing/mozharness/configs/single_locale/dev-mozilla-beta_devedition.py
@@ -1,12 +1,12 @@
 config = {
     "branch": "date",
     "nightly_build": True,
-    "update_channel": "aurora-dev",  # devedition uses aurora based branding
+    "update_channel": "aurora",  # devedition uses aurora based branding
 
     # l10n
     "hg_l10n_base": "https://hg.mozilla.org/l10n-central",
 
     # repositories
     # staging beta dev releases use date repo for now
     "mozilla_dir": "date",
     "repos": [{
--- a/testing/mozharness/configs/single_locale/dev-mozilla-release.py
+++ b/testing/mozharness/configs/single_locale/dev-mozilla-release.py
@@ -1,12 +1,12 @@
 config = {
     "branch": "jamun",
     "nightly_build": True,
-    "update_channel": "release-dev",
+    "update_channel": "release",
 
     # l10n
     "hg_l10n_base": "https://hg.mozilla.org/l10n-central",
 
     # repositories
     # staging release uses jamun
     "mozilla_dir": "jamun",
     "repos": [{