Bug 1429603: Get rid of unused builduid in mozharness; r=jlund
authorTom Prince <mozilla@hocat.ca>
Sun, 11 Feb 2018 17:21:07 -0700
changeset 404182 c550de20b6c79a607a0166d14f70b863390b43a4
parent 404181 0aec8ceb112f10d3e7fea88da94d05e9dfb8ae81
child 404183 27f83ac88526a1e058cc6a64a8060ce4f867cc45
push id99958
push usermozilla@hocat.ca
push dateFri, 16 Feb 2018 18:38:00 +0000
treeherdermozilla-inbound@90b727b890e0 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersjlund
bugs1429603
milestone60.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 1429603: Get rid of unused builduid in mozharness; r=jlund Differential Revision: https://phabricator.services.mozilla.com/D578
testing/mozharness/mozharness/mozilla/building/buildbase.py
--- a/testing/mozharness/mozharness/mozilla/building/buildbase.py
+++ b/testing/mozharness/mozharness/mozilla/building/buildbase.py
@@ -688,19 +688,17 @@ class BuildScript(BuildbotMixin, PurgeMi
         if not self.branch or not self.stage_platform:
             if not self.branch:
                 self.error("'branch' not determined and is required")
             if not self.stage_platform:
                 self.error("'stage_platform' not determined and is required")
             self.fatal("Please add missing items to your config")
         self.repo_path = None
         self.buildid = None
-        self.builduid = None
         self.query_buildid()  # sets self.buildid
-        self.query_builduid()  # sets self.builduid
         self.generated_build_props = False
         self.client_id = None
         self.access_token = None
 
         # Call this before creating the virtualenv so that we can support
         # substituting config values with other config values.
         self.query_build_env()
 
@@ -823,40 +821,16 @@ or run without that action (ie: --no-{ac
             # dirs['abs_obj_dir'] can be different from env['MOZ_OBJDIR'] on
             # mac, and that confuses mach.
             del env['MOZ_OBJDIR']
             return self.get_output_from_command(cmd,
                 cwd=dirs['abs_obj_dir'], env=env)
         else:
             return None
 
-    def query_builduid(self):
-        c = self.config
-        if self.builduid:
-            return self.builduid
-
-        builduid = None
-        if c.get("is_automation"):
-            if self.buildbot_config['properties'].get('builduid'):
-                self.info("Determining builduid from buildbot properties")
-                builduid = self.buildbot_config['properties']['builduid'].encode(
-                    'ascii', 'replace'
-                )
-
-        if not builduid:
-            self.info("Creating builduid through uuid hex")
-            builduid = generate_build_UID()
-
-        if c.get('is_automation'):
-            self.set_buildbot_property('builduid',
-                                       builduid,
-                                       write_to_file=True)
-        self.builduid = builduid
-        return self.builduid
-
     def query_buildid(self):
         c = self.config
         if self.buildid:
             return self.buildid
 
         buildid = None
         if c.get("is_automation") and self.buildbot_config['properties'].get('buildid'):
             self.info("Determining buildid from buildbot properties")