diff --git a/tools/release/auto_roll.py b/tools/release/auto_roll.py index cb72022310..12a88bd468 100755 --- a/tools/release/auto_roll.py +++ b/tools/release/auto_roll.py @@ -30,7 +30,6 @@ class Preparation(Step): MESSAGE = "Preparation." def RunStep(self): - self['json_output']['monitoring_state'] = 'preparation' # Update v8 remote tracking branches. self.GitFetchOrigin() self.Git("fetch origin +refs/tags/*:refs/tags/*") @@ -40,7 +39,6 @@ class DetectLastRoll(Step): MESSAGE = "Detect commit ID of the last Chromium roll." def RunStep(self): - self['json_output']['monitoring_state'] = 'detect_last_roll' self["last_roll"] = self._options.last_roll if not self["last_roll"]: # Get last-rolled v8 revision from Chromium's DEPS file. @@ -55,7 +53,6 @@ class DetectRevisionToRoll(Step): MESSAGE = "Detect commit ID of the V8 revision to roll." def RunStep(self): - self['json_output']['monitoring_state'] = 'detect_revision' self["roll"] = self._options.revision if self["roll"]: # If the revision was passed on the cmd line, continue script execution @@ -83,7 +80,6 @@ class DetectRevisionToRoll(Step): else: print("There is no newer v8 revision than the one in Chromium (%s)." % self["last_roll"]) - self['json_output']['monitoring_state'] = 'up_to_date' return True @@ -91,7 +87,6 @@ class PrepareRollCandidate(Step): MESSAGE = "Robustness checks of the roll candidate." def RunStep(self): - self['json_output']['monitoring_state'] = 'prepare_candidate' self["roll_title"] = self.GitLog(n=1, format="%s", git_hash=self["roll"]) @@ -106,7 +101,6 @@ class SwitchChromium(Step): MESSAGE = "Switch to Chromium checkout." def RunStep(self): - self['json_output']['monitoring_state'] = 'switch_chromium' cwd = self._options.chromium self.InitialEnvironmentChecks(cwd) # Check for a clean workdir. @@ -121,7 +115,6 @@ class UpdateChromiumCheckout(Step): MESSAGE = "Update the checkout and create a new branch." def RunStep(self): - self['json_output']['monitoring_state'] = 'update_chromium' cwd = self._options.chromium self.GitCheckout("main", cwd=cwd) self.DeleteBranch("work-branch", cwd=cwd) @@ -137,7 +130,6 @@ class UploadCL(Step): MESSAGE = "Create and upload CL." def RunStep(self): - self['json_output']['monitoring_state'] = 'upload' cwd = self._options.chromium # Patch DEPS file. if self.Command("gclient", "setdep -r src/v8@%s" % @@ -172,7 +164,6 @@ class CleanUp(Step): MESSAGE = "Done!" def RunStep(self): - self['json_output']['monitoring_state'] = 'success' print("Congratulations, you have successfully rolled %s into " "Chromium." % self["roll"]) diff --git a/tools/release/test_scripts.py b/tools/release/test_scripts.py index 4aeada90dc..ca58c8badd 100755 --- a/tools/release/test_scripts.py +++ b/tools/release/test_scripts.py @@ -579,8 +579,6 @@ deps = { "-c", TEST_CONFIG["CHROMIUM"], "--json-output", json_output_file]) self.assertEquals(0, result) - json_output = json.loads(FileToText(json_output_file)) - self.assertEquals("up_to_date", json_output["monitoring_state"]) def testChromiumRoll(self): @@ -638,9 +636,6 @@ deps = { deps = FileToText(os.path.join(chrome_dir, "DEPS")) self.assertTrue(re.search("\"v8_revision\": \"22624\"", deps)) - json_output = json.loads(FileToText(json_output_file)) - self.assertEquals("success", json_output["monitoring_state"]) - def testCheckLastPushRecently(self): self.Expect([ Cmd("git fetch origin +refs/tags/*:refs/tags/*", ""),