Bug 1259525 - release promotion - add staging mozilla-release configs to mozharness, DONTBUILD a=testing r=rail
authorJordan Lund <jlund@mozilla.com>
Tue, 29 Mar 2016 11:15:04 -0700
changeset 323706 46df2ac4c6b4e9ca7cb48f2c920a8678b332c2c4
parent 323705 f7fa7681a39f62831fc2047704cd8a24e24edffb
child 323707 435e4e199131c10583596524bf79cf1120e6a795
push id5913
push userjlund@mozilla.com
push dateMon, 25 Apr 2016 16:57:49 +0000
treeherdermozilla-beta@dcaf0a6fa115 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerstesting, rail
bugs1259525
milestone47.0a2
Bug 1259525 - release promotion - add staging mozilla-release configs to mozharness, DONTBUILD a=testing r=rail MozReview-Commit-ID: 6VfvxSaaNO0 MozReview-Commit-ID: 7aJJcWgEdeh
testing/mozharness/configs/builds/branch_specifics.py
testing/mozharness/configs/releases/dev_postrelease_firefox_release.py
testing/mozharness/configs/releases/dev_updates_firefox_beta.py
testing/mozharness/configs/releases/dev_updates_firefox_release.py
testing/mozharness/configs/releases/postrelease_firefox_release.py
testing/mozharness/configs/releases/postrelease_release.py
testing/mozharness/configs/releases/updates_firefox_release.py
testing/mozharness/configs/releases/updates_release.py
testing/mozharness/configs/single_locale/dev-mozilla-release.py
--- a/testing/mozharness/configs/builds/branch_specifics.py
+++ b/testing/mozharness/configs/builds/branch_specifics.py
@@ -316,16 +316,80 @@ config = {
     },
     'elm': {
         'stage_server': 'upload.ffxbld.productdelivery.prod.mozaws.net',
     },
     'fig': {},
     # 'graphics': {}
     # 'holly': {},
     'jamun': {
+        'update_channel': 'release-dev',
+        'enable_release_promotion': 1,
+        'platform_overrides': {
+            'linux': {
+                'src_mozconfig': 'browser/config/mozconfigs/linux32/release',
+            },
+            'linux-debug': {
+                'update_channel': 'default',
+            },
+            'linux64': {
+                'src_mozconfig': 'browser/config/mozconfigs/linux64/release',
+            },
+            'linux64-debug': {
+                'update_channel': 'default',
+            },
+            'linux64-asan-debug': {
+                'update_channel': 'default',
+            },
+            'linux64-asan': {
+                'update_channel': 'default',
+            },
+            'linux64-cc': {
+                'update_channel': 'default',
+            },
+            'linux64-st-an-debug': {
+                'update_channel': 'default',
+            },
+            'linux64-st-an': {
+                'update_channel': 'default',
+            },
+            'linux64-tsan': {
+                'update_channel': 'default',
+            },
+            'macosx64': {
+                'src_mozconfig': 'browser/config/mozconfigs/macosx-universal/release',
+            },
+            'macosx64-debug': {
+                'update_channel': 'default',
+            },
+            'macosx64-st-an': {
+                'update_channel': 'default',
+            },
+            'macosx64-mulet': {
+                'update_channel': 'default',
+            },
+            'macosx64-st-an-debug': {
+                'update_channel': 'default',
+            },
+            'win32': {
+                'src_mozconfig': 'browser/config/mozconfigs/win32/release',
+            },
+            'win32-debug': {
+                'update_channel': 'default',
+            },
+            'win32-mulet': {
+                'update_channel': 'default',
+            },
+            'win64': {
+                'src_mozconfig': 'browser/config/mozconfigs/win64/release',
+            },
+            'win64-debug': {
+                'update_channel': 'default',
+            },
+        },
         'stage_server': 'upload.ffxbld.productdelivery.prod.mozaws.net',
     },
     'larch': {
         'stage_server': 'upload.ffxbld.productdelivery.prod.mozaws.net',
     },
     # 'maple': {},
     'oak': {
         'stage_server': 'upload.ffxbld.productdelivery.prod.mozaws.net',
rename from testing/mozharness/configs/releases/postrelease_release.py
rename to testing/mozharness/configs/releases/dev_postrelease_firefox_release.py
--- a/testing/mozharness/configs/releases/postrelease_release.py
+++ b/testing/mozharness/configs/releases/dev_postrelease_firefox_release.py
@@ -1,18 +1,19 @@
 config = {
-    "log_name": "bump_release",
+    "log_name": "bump_release_dev",
     "version_files": [
         {"file": "browser/config/version.txt"},
         {"file": "browser/config/version_display.txt"},
         {"file": "config/milestone.txt"},
     ],
     "repo": {
-        "repo": "https://hg.mozilla.org/releases/mozilla-release",
+        # jamun is used for staging mozilla-release
+        "repo": "https://hg.mozilla.org/projects/jamun",
         "revision": "default",
-        "dest": "mozilla-release",
+        "dest": "jamun",
         "vcs": "hg",
     },
-    "push_dest": "ssh://hg.mozilla.org/releases/mozilla-release",
+    "push_dest": "ssh://hg.mozilla.org/projects/jamun",
     "ignore_no_changes": True,
     "ssh_user": "ffxbld",
     "ssh_key": "~/.ssh/ffxbld_rsa",
 }
--- a/testing/mozharness/configs/releases/dev_updates_firefox_beta.py
+++ b/testing/mozharness/configs/releases/dev_updates_firefox_beta.py
@@ -10,18 +10,18 @@ config = {
     },
     # TODO: use real repo
     "push_dest": "ssh://hg.mozilla.org/users/raliiev_mozilla.com/tools",
     # date repo used for staging beta
     "shipped-locales-url": "https://hg.mozilla.org/projects/date/raw-file/{revision}/browser/locales/shipped-locales",
     "ignore_no_changes": True,
     "ssh_user": "ffxbld",
     "ssh_key": "~/.ssh/ffxbld_rsa",
-    "archive_domain": "mozilla-releng-beet-mover-dev.s3-website-us-west-2.amazonaws.com",
-    "archive_prefix": "http://mozilla-releng-beet-mover-dev.s3-website-us-west-2.amazonaws.com/pub",
+    "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://ec2-54-241-39-23.us-west-1.compute.amazonaws.com",
     "balrog_username": "stage-ffxbld",
     "update_channels": {
         "beta-dev": {
             "version_regex": r"^(\d+\.\d+(b\d+)?)$",
             "requires_mirrors": True,
rename from testing/mozharness/configs/releases/updates_release.py
rename to testing/mozharness/configs/releases/dev_updates_firefox_release.py
--- a/testing/mozharness/configs/releases/updates_release.py
+++ b/testing/mozharness/configs/releases/dev_updates_firefox_release.py
@@ -1,44 +1,47 @@
 
 config = {
-    "log_name": "updates_release",
+    "log_name": "updates_release_dev",
+    # TODO: use real repo
     "repo": {
-        "repo": "https://hg.mozilla.org/build/tools",
+        "repo": "https://hg.mozilla.org/users/raliiev_mozilla.com/tools",
         "revision": "default",
         "dest": "tools",
         "vcs": "hg",
     },
-    "push_dest": "ssh://hg.mozilla.org/build/tools",
-    "shipped-locales-url": "https://hg.mozilla.org/releases/mozilla-release/raw-file/{revision}/browser/locales/shipped-locales",
+    # TODO: use real repo
+    "push_dest": "ssh://hg.mozilla.org/users/raliiev_mozilla.com/tools",
+    # jamun  repo used for staging release
+    "shipped-locales-url": "https://hg.mozilla.org/projects/jamun/raw-file/{revision}/browser/locales/shipped-locales",
     "ignore_no_changes": True,
     "ssh_user": "ffxbld",
     "ssh_key": "~/.ssh/ffxbld_rsa",
-    "archive_domain": "archive.mozilla.org",
-    "archive_prefix": "https://archive.mozilla.org/pub",
+    "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": "https://aus5.mozilla.org",
-    "balrog_username": "ffxbld",
+    "balrog_url": "http://ec2-54-241-39-23.us-west-1.compute.amazonaws.com",
+    "balrog_username": "stage-ffxbld",
     "update_channels": {
-        "beta": {
+        "beta-dev": {
             "version_regex": r"^(\d+\.\d+(b\d+)?)$",
             "requires_mirrors": False,
-            "patcher_config": "mozBeta-branch-patcher2.cfg",
-            "update_verify_channel": "beta-localtest",
+            "patcher_config": "mozDate-branch-patcher2.cfg",
+            "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"],
         },
-        "release": {
+        "release-dev": {
             "version_regex": r"^\d+\.\d+(\.\d+)?$",
             "requires_mirrors": True,
-            "patcher_config": "mozRelease-branch-patcher2.cfg",
-            "update_verify_channel": "release-localtest",
+            "patcher_config": "mozJamun-branch-patcher2.cfg",
+            "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"],
         },
     },
     "balrog_use_dummy_suffix": False,
 }
copy from testing/mozharness/configs/releases/postrelease_release.py
copy to testing/mozharness/configs/releases/postrelease_firefox_release.py
copy from testing/mozharness/configs/releases/updates_release.py
copy to testing/mozharness/configs/releases/updates_firefox_release.py
copy from testing/mozharness/configs/single_locale/mozilla-release.py
copy to testing/mozharness/configs/single_locale/dev-mozilla-release.py
--- a/testing/mozharness/configs/single_locale/mozilla-release.py
+++ b/testing/mozharness/configs/single_locale/dev-mozilla-release.py
@@ -1,30 +1,30 @@
 config = {
+    "branch": "jamun",
     "nightly_build": True,
-    "branch": "mozilla-release",
-    "en_us_binary_url": "http://ftp.mozilla.org/pub/mozilla.org/firefox/nightly/latest-mozilla-release/",
-    "update_channel": "release",
-    "latest_mar_dir": '/pub/mozilla.org/firefox/nightly/latest-mozilla-release-l10n',
+    "update_channel": "release-dev",
+    "latest_mar_dir": 'fake_kill_me',
 
     # l10n
     "hg_l10n_base": "https://hg.mozilla.org/releases/l10n/mozilla-release",
 
     # repositories
-    "mozilla_dir": "mozilla-release",
+    # staging release uses jamun
+    "mozilla_dir": "jamun",
     "repos": [{
         "vcs": "hg",
         "repo": "https://hg.mozilla.org/build/tools",
         "revision": "default",
         "dest": "tools",
     }, {
         "vcs": "hgtool",
-        "repo": "https://hg.mozilla.org/releases/mozilla-release",
+        "repo": "https://hg.mozilla.org/projects/jamun",
         "revision": "default",
-        "dest": "mozilla-release",
+        "dest": "jamun",
     }, {
         "vcs": "hgtool",
         "repo": "https://hg.mozilla.org/build/compare-locales",
         "revision": "RELEASE_AUTOMATION"
     }],
     # purge options
     'purge_minsize': 12,
     'is_automation': True,