Bug 1381577 - Win nightlies should generate and upload balrog_props.json. r=kmoir draft
authorJustin Wood <Callek@gmail.com>
Mon, 17 Jul 2017 16:06:14 -0400
changeset 611724 870b3029304e5c1f34ccc49fbd3113c984c13e6d
parent 611723 7d8736e17232b74983cfa72097a726d1ac1b36c9
child 611725 70c163f649850b4cafc24fd73c06b142a2131837
push id69287
push userCallek@gmail.com
push dateThu, 20 Jul 2017 01:11:37 +0000
reviewerskmoir
bugs1381577
milestone56.0a1
Bug 1381577 - Win nightlies should generate and upload balrog_props.json. r=kmoir Land date changes to support windows nightlies onto central MozReview-Commit-ID: Jwk7c2W1QP7
taskcluster/ci/build/windows.yml
testing/mozharness/configs/builds/taskcluster_firefox_windows_32_opt.py
testing/mozharness/configs/builds/taskcluster_firefox_windows_64_opt.py
testing/mozharness/mozharness/mozilla/building/buildbase.py
testing/mozharness/mozharness/mozilla/updates/balrog.py
--- a/taskcluster/ci/build/windows.yml
+++ b/taskcluster/ci/build/windows.yml
@@ -157,16 +157,17 @@ win32-nightly/opt:
         tier: 2
     worker-type: aws-provisioner-v1/gecko-{level}-b-win2012
     worker:
         max-run-time: 7200
         env:
             TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/win32/releng.manifest"
     run:
         using: mozharness
+        actions: [clone-tools, build, check-test, update]
         script: mozharness/scripts/fx_desktop_build.py
         config:
             - builds/taskcluster_firefox_windows_32_opt.py
             - disable_signing.py
             - taskcluster_nightly.py
     run-on-projects: []
 
 win64-nightly/opt:
@@ -183,16 +184,17 @@ win64-nightly/opt:
         tier: 2
     worker-type: aws-provisioner-v1/gecko-{level}-b-win2012
     worker:
         max-run-time: 7200
         env:
             TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/win64/releng.manifest"
     run:
         using: mozharness
+        actions: [clone-tools, build, check-test, update]
         script: mozharness/scripts/fx_desktop_build.py
         config:
             - builds/taskcluster_firefox_windows_64_opt.py
             - disable_signing.py
             - taskcluster_nightly.py
     run-on-projects: []
 
 win64/pgo:
--- a/testing/mozharness/configs/builds/taskcluster_firefox_windows_32_opt.py
+++ b/testing/mozharness/configs/builds/taskcluster_firefox_windows_32_opt.py
@@ -15,16 +15,17 @@ config = {
     # - taskcluster_firefox_win32_clang_debug
     # - taskcluster_firefox_win64_clang
     # - taskcluster_firefox_win64_clang_debug
 
     'default_actions': [
         'clone-tools',
         'build',
         'check-test',
+        'update',
     ],
     'exes': {
         'virtualenv': [
             sys.executable,
             os.path.join(
                 os.getcwd(), 'build', 'src', 'third_party', 'python', 'virtualenv', 'virtualenv.py'
             )
         ],
--- a/testing/mozharness/configs/builds/taskcluster_firefox_windows_64_opt.py
+++ b/testing/mozharness/configs/builds/taskcluster_firefox_windows_64_opt.py
@@ -15,16 +15,17 @@ config = {
     # - taskcluster_firefox_win32_clang_debug
     # - taskcluster_firefox_win64_clang
     # - taskcluster_firefox_win64_clang_debug
 
     'default_actions': [
         'clone-tools',
         'build',
         'check-test',
+        'update',
     ],
     'exes': {
         'virtualenv': [
             sys.executable,
             os.path.join(
                 os.getcwd(), 'build', 'src', 'third_party', 'python', 'virtualenv', 'virtualenv.py'
             )
         ],
--- a/testing/mozharness/mozharness/mozilla/building/buildbase.py
+++ b/testing/mozharness/mozharness/mozilla/building/buildbase.py
@@ -806,17 +806,17 @@ or run without that action (ie: --no-{ac
                 # MOZ_BUILD_DATE into mozharness as an environment variable, only
                 # to have it pass the same value out with the same name.
                 buildid = os.environ.get('MOZ_BUILD_DATE')
 
         if not buildid:
             self.info("Creating buildid through current time")
             buildid = generate_build_ID()
 
-        if c.get('is_automation'):
+        if c.get('is_automation') or os.environ.get("TASK_ID"):
             self.set_buildbot_property('buildid',
                                        buildid,
                                        write_to_file=True)
 
         self.buildid = buildid
         return self.buildid
 
     def _query_objdir(self):
--- a/testing/mozharness/mozharness/mozilla/updates/balrog.py
+++ b/testing/mozharness/mozharness/mozilla/updates/balrog.py
@@ -34,16 +34,20 @@ class BalrogMixin(object):
             buildbot_properties = self.buildbot_config["properties"].items()
         else:
             buildbot_properties = []
 
         balrog_props = dict(properties=dict(chain(
             buildbot_properties,
             self.buildbot_properties.items(),
         )))
+        if self.config.get('stage_platform'):
+            balrog_props['properties']['stage_platform'] = self.config['stage_platform']
+        if self.config.get('platform'):
+            balrog_props['properties']['platform'] = self.config['platform']
         if self.config.get('balrog_platform'):
             balrog_props["properties"]["platform"] = self.config['balrog_platform']
         if "branch" not in balrog_props["properties"]:
             balrog_props["properties"]["branch"] = self.branch
 
         self.dump_config(props_path, balrog_props)
 
     def submit_balrog_updates(self, release_type="nightly", product=None):