Bug 1258059 - generify dev configs and env for relpro by removing date strings and allow multiple products, CLOSED TREE DONTBUILD a=testing r=rail
authorJordan Lund <jlund@mozilla.com>
Tue, 22 Mar 2016 10:15:11 -0700
changeset 323540 45fb6a3c0714041c7a6ff3b31ecc1b0ce298d985
parent 323539 7c515321a7408fc184a3545e71fb5faa14418ce0
child 323541 f482e89e43f0de257c74099e135ef8fe3058dbd4
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
bugs1258059
milestone47.0a2
Bug 1258059 - generify dev configs and env for relpro by removing date strings and allow multiple products, CLOSED TREE DONTBUILD a=testing r=rail stub installers with beta-dev, add staging beta single locale, r?rail MozReview-Commit-ID: 6h1TtzVO1Jp MozReview-Commit-ID: Gtf4cJKsAPu
browser/confvars.sh
testing/mozharness/configs/builds/branch_specifics.py
testing/mozharness/configs/releases/dev_bouncer_firefox_beta.py
testing/mozharness/configs/releases/dev_postrelease_firefox_beta.py
testing/mozharness/configs/releases/dev_updates_firefox_beta.py
testing/mozharness/configs/releases/postrelease_beta.py
testing/mozharness/configs/releases/postrelease_date.py
testing/mozharness/configs/releases/postrelease_firefox_beta.py
testing/mozharness/configs/releases/updates_beta.py
testing/mozharness/configs/releases/updates_date.py
testing/mozharness/configs/releases/updates_firefox_beta.py
testing/mozharness/configs/single_locale/dev-mozilla-beta.py
--- a/browser/confvars.sh
+++ b/browser/confvars.sh
@@ -9,17 +9,19 @@ MOZ_UPDATER=1
 MOZ_PHOENIX=1
 
 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" = "aurora" -o \
             "$MOZ_UPDATE_CHANNEL" = "beta" -o \
-            "$MOZ_UPDATE_CHANNEL" = "release"; then
+            "$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
 
 # Enable building ./signmar and running libmar signature tests
--- a/testing/mozharness/configs/builds/branch_specifics.py
+++ b/testing/mozharness/configs/builds/branch_specifics.py
@@ -223,16 +223,17 @@ config = {
     },
     'ux': {
         "graph_server_branch_name": "UX",
         'stage_server': 'upload.ffxbld.productdelivery.prod.mozaws.net',
     },
     # When build promotion goes live the mozconfig changes are probably better
     # expressed once in files like configs/builds/releng_base_windows_32_builds.py
     'date': {
+        'update_channel': 'beta-dev',
         'enable_release_promotion': 1,
         'platform_overrides': {
             'linux': {
                 'src_mozconfig': 'browser/config/mozconfigs/linux32/beta',
             },
             'linux-debug': {
                 'update_channel': 'default',
             },
new file mode 100644
--- /dev/null
+++ b/testing/mozharness/configs/releases/dev_bouncer_firefox_beta.py
@@ -0,0 +1,130 @@
+# lint_ignore=E501
+config = {
+    "products": {
+        "installer": {
+            "product-name": "Firefox-%(version)s",
+            "ssl-only": False,
+            "add-locales": False,
+            "paths": {
+                "linux": {
+                    "path": "/firefox/releases/%(version)s/linux-i686/:lang/firefox-%(version)s.tar.bz2",
+                    "bouncer-platform": "linux",
+                },
+                "linux64": {
+                    "path": "/firefox/releases/%(version)s/linux-x86_64/:lang/firefox-%(version)s.tar.bz2",
+                    "bouncer-platform": "linux64",
+                },
+                "macosx64": {
+                    "path": "/firefox/releases/%(version)s/mac/:lang/Firefox%%20%(version)s.dmg",
+                    "bouncer-platform": "osx",
+                },
+                "win32": {
+                    "path": "/firefox/releases/%(version)s/win32/:lang/Firefox%%20Setup%%20%(version)s.exe",
+                    "bouncer-platform": "win",
+                },
+                "win64": {
+                    "path": "/firefox/releases/%(version)s/win64/:lang/Firefox%%20Setup%%20%(version)s.exe",
+                    "bouncer-platform": "win64",
+                },
+            },
+        },
+        "installer-ssl": {
+            "product-name": "Firefox-%(version)s-SSL",
+            "ssl-only": True,
+            "add-locales": False,
+            "paths": {
+                "linux": {
+                    "path": "/firefox/releases/%(version)s/linux-i686/:lang/firefox-%(version)s.tar.bz2",
+                    "bouncer-platform": "linux",
+                },
+                "linux64": {
+                    "path": "/firefox/releases/%(version)s/linux-x86_64/:lang/firefox-%(version)s.tar.bz2",
+                    "bouncer-platform": "linux64",
+                },
+                "macosx64": {
+                    "path": "/firefox/releases/%(version)s/mac/:lang/Firefox%%20%(version)s.dmg",
+                    "bouncer-platform": "osx",
+                },
+                "win32": {
+                    "path": "/firefox/releases/%(version)s/win32/:lang/Firefox%%20Setup%%20%(version)s.exe",
+                    "bouncer-platform": "win",
+                },
+                "win64": {
+                    "path": "/firefox/releases/%(version)s/win64/:lang/Firefox%%20Setup%%20%(version)s.exe",
+                    "bouncer-platform": "win64",
+                },
+            },
+        },
+        "stub-installer": {
+            "product-name": "Firefox-%(version)s-stub",
+            "ssl-only": True,
+            "add-locales": False,
+            "paths": {
+                "win32": {
+                    "path": "/firefox/releases/%(version)s/win32/:lang/Firefox%%20Setup%%20Stub%%20%(version)s.exe",
+                    "bouncer-platform": "win",
+                },
+                "win64": {
+                    "path": "/firefox/releases/%(version)s/win64/:lang/Firefox%%20Setup%%20Stub%%20%(version)s.exe",
+                    "bouncer-platform": "win64",
+                },
+            },
+        },
+        "complete-mar": {
+            "product-name": "Firefox-%(version)s-Complete",
+            "ssl-only": False,
+            "add-locales": False,
+            "paths": {
+                "linux": {
+                    "path": "/firefox/releases/%(version)s/update/linux-i686/:lang/firefox-%(version)s.complete.mar",
+                    "bouncer-platform": "linux",
+                },
+                "linux64": {
+                    "path": "/firefox/releases/%(version)s/update/linux-x86_64/:lang/firefox-%(version)s.complete.mar",
+                    "bouncer-platform": "linux64",
+                },
+                "macosx64": {
+                    "path": "/firefox/releases/%(version)s/update/mac/:lang/firefox-%(version)s.complete.mar",
+                    "bouncer-platform": "osx",
+                },
+                "win32": {
+                    "path": "/firefox/releases/%(version)s/update/win32/:lang/firefox-%(version)s.complete.mar",
+                    "bouncer-platform": "win",
+                },
+                "win64": {
+                    "path": "/firefox/releases/%(version)s/update/win64/:lang/firefox-%(version)s.complete.mar",
+                    "bouncer-platform": "win64",
+                },
+            },
+        },
+    },
+    "partials": {
+        "releases-dir": {
+            "product-name": "Firefox-%(version)s-Partial-%(prev_version)s",
+            "ssl-only": False,
+            "add-locales": False,
+            "paths": {
+                "linux": {
+                    "path": "/firefox/releases/%(version)s/update/linux-i686/:lang/firefox-%(prev_version)s-%(version)s.partial.mar",
+                    "bouncer-platform": "linux",
+                },
+                "linux64": {
+                    "path": "/firefox/releases/%(version)s/update/linux-x86_64/:lang/firefox-%(prev_version)s-%(version)s.partial.mar",
+                    "bouncer-platform": "linux64",
+                },
+                "macosx64": {
+                    "path": "/firefox/releases/%(version)s/update/mac/:lang/firefox-%(prev_version)s-%(version)s.partial.mar",
+                    "bouncer-platform": "osx",
+                },
+                "win32": {
+                    "path": "/firefox/releases/%(version)s/update/win32/:lang/firefox-%(prev_version)s-%(version)s.partial.mar",
+                    "bouncer-platform": "win",
+                },
+                "win64": {
+                    "path": "/firefox/releases/%(version)s/update/win64/:lang/firefox-%(prev_version)s-%(version)s.partial.mar",
+                    "bouncer-platform": "win64",
+                },
+            },
+        },
+    },
+}
rename from testing/mozharness/configs/releases/postrelease_date.py
rename to testing/mozharness/configs/releases/dev_postrelease_firefox_beta.py
--- a/testing/mozharness/configs/releases/postrelease_date.py
+++ b/testing/mozharness/configs/releases/dev_postrelease_firefox_beta.py
@@ -1,14 +1,17 @@
 config = {
+    # date is used for staging mozilla-beta
     "log_name": "bump_date",
     "version_files": [{"file": "browser/config/version_display.txt"}],
     "repo": {
+        # date is used for staging mozilla-beta
         "repo": "https://hg.mozilla.org/projects/date",
         "revision": "default",
         "dest": "date",
         "vcs": "hg",
     },
+    # date is used for staging mozilla-beta
     "push_dest": "ssh://hg.mozilla.org/projects/date",
     "ignore_no_changes": True,
     "ssh_user": "ffxbld",
     "ssh_key": "~/.ssh/ffxbld_rsa",
 }
rename from testing/mozharness/configs/releases/updates_date.py
rename to testing/mozharness/configs/releases/dev_updates_firefox_beta.py
--- a/testing/mozharness/configs/releases/updates_date.py
+++ b/testing/mozharness/configs/releases/dev_updates_firefox_beta.py
@@ -1,35 +1,37 @@
 
 config = {
-    "log_name": "bump_date",
+    "log_name": "bump_beta_dev",
     # TODO: use real repo
     "repo": {
         "repo": "https://hg.mozilla.org/users/raliiev_mozilla.com/tools",
         "revision": "default",
         "dest": "tools",
         "vcs": "hg",
     },
     # 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",
     "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": {
-        "date": {
+        "beta-dev": {
             "version_regex": r"^(\d+\.\d+(b\d+)?)$",
             "requires_mirrors": True,
+            # TODO - when we use a real repo, rename this file # s/MozDate/MozBeta-dev/
             "patcher_config": "mozDate-branch-patcher2.cfg",
-            "update_verify_channel": "date-localtest",
+            "update_verify_channel": "beta-dev-localtest",
             "mar_channel_ids": [],
-            "channel_names": ["date", "date-localtest", "date-cdntest"],
-            "rules_to_update": ["firefox-date-cdntest", "firefox-date-localtest"],
+            "channel_names": ["beta-dev", "beta-dev-localtest", "beta-dev-cdntest"],
+            "rules_to_update": ["firefox-beta-dev-cdntest", "firefox-beta-dev-localtest"],
         }
     },
     "balrog_use_dummy_suffix": False,
 }
rename from testing/mozharness/configs/releases/postrelease_beta.py
rename to testing/mozharness/configs/releases/postrelease_firefox_beta.py
rename from testing/mozharness/configs/releases/updates_beta.py
rename to testing/mozharness/configs/releases/updates_firefox_beta.py
new file mode 100644
--- /dev/null
+++ b/testing/mozharness/configs/single_locale/dev-mozilla-beta.py
@@ -0,0 +1,42 @@
+config = {
+    "branch": "date",
+    "nightly_build": True,
+    "update_channel": "beta-dev",
+
+    # l10n
+    "hg_l10n_base": "https://hg.mozilla.org/releases/l10n/mozilla-beta",
+
+    # mar
+    "latest_mar_dir": "fake_kill_me",
+
+    # repositories
+    # staging beta dev releases use date repo for now
+    "mozilla_dir": "date",
+    "repos": [{
+        "vcs": "hg",
+        "repo": "https://hg.mozilla.org/build/tools",
+        "revision": "default",
+        "dest": "tools",
+    }, {
+        "vcs": "hgtool",
+        "repo": "https://hg.mozilla.org/projects/date",
+        "revision": "default",
+        "dest": "date",
+    }, {
+        "vcs": "hgtool",
+        "repo": "https://hg.mozilla.org/build/compare-locales",
+        "revision": "RELEASE_AUTOMATION"
+    }],
+    # purge options
+    'is_automation': True,
+    'purge_minsize': 12,
+    'default_actions': [
+        "clobber",
+        "pull",
+        "list-locales",
+        "setup",
+        "repack",
+        "taskcluster-upload",
+        "summary",
+    ],
+}