AuroraMiddleware/v8
1
0
Fork 0
Code Issues 2 Pull Requests Releases Wiki Activity

[roll] Remove monitoring state

Browse Source 
Bug: chromium:1411311
Change-Id: Ib810119f8b78992971c804af06ed6bd7d8c7d9cd
Reviewed-on: https://chromium-review.googlesource.com/c/v8/v8/+/4224678
Commit-Queue: Alexander Schulze <alexschulze@chromium.org>
Reviewed-by: Michael Achenbach <machenbach@chromium.org>
Cr-Commit-Position: refs/heads/main@{#85709}
This commit is contained in:
Alexander Schulze 2023-02-07 15:36:31 +01:00 committed by V8 LUCI CQ
parent babc4b1d6b
commit d367ee2ac6
2 changed files with 0 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
tools/release/auto_roll.py
View File

@ -30,7 +30,6 @@ class Preparation(Step):
MESSAGE = "Preparation." MESSAGE = "Preparation."
def RunStep(self): def RunStep(self):
self['json_output']['monitoring_state'] = 'preparation'
# Update v8 remote tracking branches. # Update v8 remote tracking branches.
self.GitFetchOrigin() self.GitFetchOrigin()
self.Git("fetch origin +refs/tags/*:refs/tags/*") self.Git("fetch origin +refs/tags/*:refs/tags/*")
@ -40,7 +39,6 @@ class DetectLastRoll(Step):
MESSAGE = "Detect commit ID of the last Chromium roll." MESSAGE = "Detect commit ID of the last Chromium roll."
def RunStep(self): def RunStep(self):
self['json_output']['monitoring_state'] = 'detect_last_roll'
self["last_roll"] = self._options.last_roll self["last_roll"] = self._options.last_roll
if not self["last_roll"]: if not self["last_roll"]:
# Get last-rolled v8 revision from Chromium's DEPS file. # 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." MESSAGE = "Detect commit ID of the V8 revision to roll."
def RunStep(self): def RunStep(self):
self['json_output']['monitoring_state'] = 'detect_revision'
self["roll"] = self._options.revision self["roll"] = self._options.revision
if self["roll"]: if self["roll"]:
# If the revision was passed on the cmd line, continue script execution # If the revision was passed on the cmd line, continue script execution
@ -83,7 +80,6 @@ class DetectRevisionToRoll(Step):
else: else:
print("There is no newer v8 revision than the one in Chromium (%s)." print("There is no newer v8 revision than the one in Chromium (%s)."
% self["last_roll"]) % self["last_roll"])
self['json_output']['monitoring_state'] = 'up_to_date'
return True return True
@ -91,7 +87,6 @@ class PrepareRollCandidate(Step):
MESSAGE = "Robustness checks of the roll candidate." MESSAGE = "Robustness checks of the roll candidate."
def RunStep(self): def RunStep(self):
self['json_output']['monitoring_state'] = 'prepare_candidate'
self["roll_title"] = self.GitLog(n=1, format="%s", self["roll_title"] = self.GitLog(n=1, format="%s",
git_hash=self["roll"]) git_hash=self["roll"])
@ -106,7 +101,6 @@ class SwitchChromium(Step):
MESSAGE = "Switch to Chromium checkout." MESSAGE = "Switch to Chromium checkout."
def RunStep(self): def RunStep(self):
self['json_output']['monitoring_state'] = 'switch_chromium'
cwd = self._options.chromium cwd = self._options.chromium
self.InitialEnvironmentChecks(cwd) self.InitialEnvironmentChecks(cwd)
# Check for a clean workdir. # Check for a clean workdir.
@ -121,7 +115,6 @@ class UpdateChromiumCheckout(Step):
MESSAGE = "Update the checkout and create a new branch." MESSAGE = "Update the checkout and create a new branch."
def RunStep(self): def RunStep(self):
self['json_output']['monitoring_state'] = 'update_chromium'
cwd = self._options.chromium cwd = self._options.chromium
self.GitCheckout("main", cwd=cwd) self.GitCheckout("main", cwd=cwd)
self.DeleteBranch("work-branch", cwd=cwd) self.DeleteBranch("work-branch", cwd=cwd)
@ -137,7 +130,6 @@ class UploadCL(Step):
MESSAGE = "Create and upload CL." MESSAGE = "Create and upload CL."
def RunStep(self): def RunStep(self):
self['json_output']['monitoring_state'] = 'upload'
cwd = self._options.chromium cwd = self._options.chromium
# Patch DEPS file. # Patch DEPS file.
if self.Command("gclient", "setdep -r src/v8@%s" % if self.Command("gclient", "setdep -r src/v8@%s" %
@ -172,7 +164,6 @@ class CleanUp(Step):
MESSAGE = "Done!" MESSAGE = "Done!"
def RunStep(self): def RunStep(self):
self['json_output']['monitoring_state'] = 'success'
print("Congratulations, you have successfully rolled %s into " print("Congratulations, you have successfully rolled %s into "
"Chromium." "Chromium."
% self["roll"]) % self["roll"])

5
tools/release/test_scripts.py
View File

@ -579,8 +579,6 @@ deps = {
"-c", TEST_CONFIG["CHROMIUM"], "-c", TEST_CONFIG["CHROMIUM"],
"--json-output", json_output_file]) "--json-output", json_output_file])
self.assertEquals(0, result) self.assertEquals(0, result)
json_output = json.loads(FileToText(json_output_file))
self.assertEquals("up_to_date", json_output["monitoring_state"])
def testChromiumRoll(self): def testChromiumRoll(self):
@ -638,9 +636,6 @@ deps = {
deps = FileToText(os.path.join(chrome_dir, "DEPS")) deps = FileToText(os.path.join(chrome_dir, "DEPS"))
self.assertTrue(re.search("\"v8_revision\": \"22624\"", 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): def testCheckLastPushRecently(self):
self.Expect([ self.Expect([
Cmd("git fetch origin +refs/tags/*:refs/tags/*", ""), Cmd("git fetch origin +refs/tags/*:refs/tags/*", ""),