Revision: 20205
Author: [email protected]
Date: Mon Mar 24 15:52:31 2014 UTC
Log: Change auto-roll to auto-push for automatic trunk pushes.
The current script is only performing automatic pushes to trunk. This
prepares for adding an auto-roll script that actually rolls to Chromium.
This also removes the v8-status updates, which are no longer necessary due
to not touching bleeding edge any more.
BUG=
[email protected]
Review URL: https://codereview.chromium.org/196173018
http://code.google.com/p/v8/source/detail?r=20205
Added:
/branches/bleeding_edge/tools/push-to-trunk/auto_push.py
Deleted:
/branches/bleeding_edge/tools/push-to-trunk/auto_roll.py
Modified:
/branches/bleeding_edge/tools/push-to-trunk/test_scripts.py
=======================================
--- /dev/null
+++ /branches/bleeding_edge/tools/push-to-trunk/auto_push.py Mon Mar 24
15:52:31 2014 UTC
@@ -0,0 +1,156 @@
+#!/usr/bin/env python
+# Copyright 2013 the V8 project authors. All rights reserved.
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are
+# met:
+#
+# * Redistributions of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+# * Redistributions in binary form must reproduce the above
+# copyright notice, this list of conditions and the following
+# disclaimer in the documentation and/or other materials provided
+# with the distribution.
+# * Neither the name of Google Inc. nor the names of its
+# contributors may be used to endorse or promote products derived
+# from this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+import argparse
+import json
+import os
+import re
+import sys
+import urllib
+
+from common_includes import *
+import push_to_trunk
+
+SETTINGS_LOCATION = "SETTINGS_LOCATION"
+
+CONFIG = {
+ PERSISTFILE_BASENAME: "/tmp/v8-auto-roll-tempfile",
+ DOT_GIT_LOCATION: ".git",
+ SETTINGS_LOCATION: "~/.auto-roll",
+}
+
+PUSH_MESSAGE_RE = re.compile(r".* \(based on bleeding_edge revision
r(\d+)\)$")
+
+
+class Preparation(Step):
+ MESSAGE = "Preparation."
+
+ def RunStep(self):
+ self.InitialEnvironmentChecks()
+ self.CommonPrepare()
+
+
+class CheckAutoPushSettings(Step):
+ MESSAGE = "Checking settings file."
+
+ def RunStep(self):
+ settings_file = os.path.realpath(self.Config(SETTINGS_LOCATION))
+ if os.path.exists(settings_file):
+ settings_dict = json.loads(FileToText(settings_file))
+ if settings_dict.get("enable_auto_roll") is False:
+ self.Die("Push to trunk disabled by auto-roll settings file: %s"
+ % settings_file)
+
+
+class CheckTreeStatus(Step):
+ MESSAGE = "Checking v8 tree status message."
+
+ def RunStep(self):
+ status_url = "https://v8-status.appspot.com/current?format=json";
+ status_json = self.ReadURL(status_url, wait_plan=[5, 20, 300, 300])
+ self["tree_message"] = json.loads(status_json)["message"]
+ if re.search(r"nopush|no push", self["tree_message"], flags=re.I):
+ self.Die("Push to trunk disabled by tree state: %s"
+ % self["tree_message"])
+
+
+class FetchLKGR(Step):
+ MESSAGE = "Fetching V8 LKGR."
+
+ def RunStep(self):
+ lkgr_url = "https://v8-status.appspot.com/lkgr";
+ # Retry several times since app engine might have issues.
+ self["lkgr"] = self.ReadURL(lkgr_url, wait_plan=[5, 20, 300, 300])
+
+
+class CheckLastPush(Step):
+ MESSAGE = "Checking last V8 push to trunk."
+
+ def RunStep(self):
+ last_push = self.FindLastTrunkPush()
+
+ # Retrieve the bleeding edge revision of the last push from the text in
+ # the push commit message.
+ last_push_title = self.GitLog(n=1, format="%s", git_hash=last_push)
+ last_push_be = PUSH_MESSAGE_RE.match(last_push_title).group(1)
+
+ if not last_push_be: # pragma: no cover
+ self.Die("Could not retrieve bleeding edge revision for trunk
push %s"
+ % last_push)
+
+ # TODO(machenbach): This metric counts all revisions. It could be
+ # improved by counting only the revisions on bleeding_edge.
+ if int(self["lkgr"]) - int(last_push_be) < 10: # pragma: no cover
+ # This makes sure the script doesn't push twice in a row when the
cron
+ # job retries several times.
+ self.Die("Last push too recently: %s" % last_push_be)
+
+
+class PushToTrunk(Step):
+ MESSAGE = "Pushing to trunk if specified."
+
+ def RunStep(self):
+ print "Pushing lkgr %s to trunk." % self["lkgr"]
+
+ # TODO(machenbach): Update the script before calling it.
+ if self._options.push:
+ P = push_to_trunk.PushToTrunk
+ self._side_effect_handler.Call(
+ P(push_to_trunk.CONFIG, self._side_effect_handler).Run,
+ ["--author", self._options.author,
+ "--reviewer", self._options.reviewer,
+ "--revision", self["lkgr"],
+ "--force"])
+
+
+class AutoPush(ScriptsBase):
+ def _PrepareOptions(self, parser):
+ parser.add_argument("-p", "--push",
+ help="Push to trunk. Dry run if unspecified.",
+ default=False, action="store_true")
+
+ def _ProcessOptions(self, options):
+ if not options.author or not options.reviewer: # pragma: no cover
+ print "You need to specify author and reviewer."
+ return False
+ options.requires_editor = False
+ return True
+
+ def _Steps(self):
+ return [
+ Preparation,
+ CheckAutoPushSettings,
+ CheckTreeStatus,
+ FetchLKGR,
+ CheckLastPush,
+ PushToTrunk,
+ ]
+
+
+if __name__ == "__main__": # pragma: no cover
+ sys.exit(AutoPush(CONFIG).Run())
=======================================
--- /branches/bleeding_edge/tools/push-to-trunk/auto_roll.py Mon Mar 24
08:03:15 2014 UTC
+++ /dev/null
@@ -1,178 +0,0 @@
-#!/usr/bin/env python
-# Copyright 2013 the V8 project authors. All rights reserved.
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are
-# met:
-#
-# * Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-# * Redistributions in binary form must reproduce the above
-# copyright notice, this list of conditions and the following
-# disclaimer in the documentation and/or other materials provided
-# with the distribution.
-# * Neither the name of Google Inc. nor the names of its
-# contributors may be used to endorse or promote products derived
-# from this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-import argparse
-import json
-import os
-import re
-import sys
-import urllib
-
-from common_includes import *
-import push_to_trunk
-
-SETTINGS_LOCATION = "SETTINGS_LOCATION"
-
-CONFIG = {
- PERSISTFILE_BASENAME: "/tmp/v8-auto-roll-tempfile",
- DOT_GIT_LOCATION: ".git",
- SETTINGS_LOCATION: "~/.auto-roll",
-}
-
-PUSH_MESSAGE_RE = re.compile(r".* \(based on bleeding_edge revision
r(\d+)\)$")
-
-
-class Preparation(Step):
- MESSAGE = "Preparation."
-
- def RunStep(self):
- self.InitialEnvironmentChecks()
- self.CommonPrepare()
-
-
-class CheckAutoRollSettings(Step):
- MESSAGE = "Checking settings file."
-
- def RunStep(self):
- settings_file = os.path.realpath(self.Config(SETTINGS_LOCATION))
- if os.path.exists(settings_file):
- settings_dict = json.loads(FileToText(settings_file))
- if settings_dict.get("enable_auto_roll") is False:
- self.Die("Push to trunk disabled by auto-roll settings file: %s"
- % settings_file)
-
-
-class CheckTreeStatus(Step):
- MESSAGE = "Checking v8 tree status message."
-
- def RunStep(self):
- status_url = "https://v8-status.appspot.com/current?format=json";
- status_json = self.ReadURL(status_url, wait_plan=[5, 20, 300, 300])
- self["tree_message"] = json.loads(status_json)["message"]
- if re.search(r"nopush|no push", self["tree_message"], flags=re.I):
- self.Die("Push to trunk disabled by tree state: %s"
- % self["tree_message"])
-
-
-class FetchLKGR(Step):
- MESSAGE = "Fetching V8 LKGR."
-
- def RunStep(self):
- lkgr_url = "https://v8-status.appspot.com/lkgr";
- # Retry several times since app engine might have issues.
- self["lkgr"] = self.ReadURL(lkgr_url, wait_plan=[5, 20, 300, 300])
-
-
-class CheckLastPush(Step):
- MESSAGE = "Checking last V8 push to trunk."
-
- def RunStep(self):
- last_push = self.FindLastTrunkPush()
-
- # Retrieve the bleeding edge revision of the last push from the text in
- # the push commit message.
- last_push_title = self.GitLog(n=1, format="%s", git_hash=last_push)
- last_push_be = PUSH_MESSAGE_RE.match(last_push_title).group(1)
-
- if not last_push_be: # pragma: no cover
- self.Die("Could not retrieve bleeding edge revision for trunk
push %s"
- % last_push)
-
- # TODO(machenbach): This metric counts all revisions. It could be
- # improved by counting only the revisions on bleeding_edge.
- if int(self["lkgr"]) - int(last_push_be) < 10: # pragma: no cover
- # This makes sure the script doesn't push twice in a row when the
cron
- # job retries several times.
- self.Die("Last push too recently: %s" % last_push_be)
-
-
-class PushToTrunk(Step):
- MESSAGE = "Pushing to trunk if specified."
-
- def PushTreeStatus(self, message):
- if not self._options.status_password:
- print "Skipping tree status update without password file."
- return
- params = {
- "message": message,
- "username": "[email protected]",
- "password": FileToText(self._options.status_password).strip(),
- }
- params = urllib.urlencode(params)
- print "Pushing tree status: '%s'" % message
- self.ReadURL("https://v8-status.appspot.com/status";, params,
- wait_plan=[5, 20])
-
- def RunStep(self):
- print "Pushing lkgr %s to trunk." % self["lkgr"]
- self.PushTreeStatus("Tree is closed (preparing to push)")
-
- # TODO(machenbach): Update the script before calling it.
- try:
- if self._options.push:
- P = push_to_trunk.PushToTrunk
- self._side_effect_handler.Call(
- P(push_to_trunk.CONFIG, self._side_effect_handler).Run,
- ["--author", self._options.author,
- "--reviewer", self._options.reviewer,
- "--revision", self["lkgr"],
- "--force"])
- finally:
- self.PushTreeStatus(self["tree_message"])
-
-
-class AutoRoll(ScriptsBase):
- def _PrepareOptions(self, parser):
- parser.add_argument("-c", "--chromium",
- help=("Deprecated."))
- parser.add_argument("-p", "--push",
- help="Push to trunk. Dry run if unspecified.",
- default=False, action="store_true")
- parser.add_argument("--status-password",
- help="A file with the password to the status app.")
-
- def _ProcessOptions(self, options):
- if not options.author or not options.reviewer: # pragma: no cover
- print "You need to specify author and reviewer."
- return False
- options.requires_editor = False
- return True
-
- def _Steps(self):
- return [
- Preparation,
- CheckAutoRollSettings,
- CheckTreeStatus,
- FetchLKGR,
- CheckLastPush,
- PushToTrunk,
- ]
-
-
-if __name__ == "__main__": # pragma: no cover
- sys.exit(AutoRoll(CONFIG).Run())
=======================================
--- /branches/bleeding_edge/tools/push-to-trunk/test_scripts.py Fri Mar 21
15:04:54 2014 UTC
+++ /branches/bleeding_edge/tools/push-to-trunk/test_scripts.py Mon Mar 24
15:52:31 2014 UTC
@@ -31,9 +31,9 @@
import traceback
import unittest
-import auto_roll
-from auto_roll import CheckLastPush
-from auto_roll import SETTINGS_LOCATION
+import auto_push
+from auto_push import CheckLastPush
+from auto_push import SETTINGS_LOCATION
import common_includes
from common_includes import *
import merge_to_branch
@@ -67,9 +67,8 @@
}
-AUTO_ROLL_ARGS = [
+AUTO_PUSH_ARGS = [
"-a", "[email protected]",
- "-c", TEST_CONFIG[CHROMIUM],
"-r", "[email protected]",
]
@@ -840,13 +839,11 @@
self._state["lkgr"] = "101"
- self.assertRaises(Exception, lambda: self.RunStep(auto_roll.AutoRoll,
+ self.assertRaises(Exception, lambda: self.RunStep(auto_push.AutoPush,
CheckLastPush,
- AUTO_ROLL_ARGS))
+ AUTO_PUSH_ARGS))
- def testAutoRoll(self):
- password = self.MakeEmptyTempFile()
- TextToFile("PW", password)
+ def testAutoPush(self):
TEST_CONFIG[DOT_GIT_LOCATION] = self.MakeEmptyTempFile()
TEST_CONFIG[SETTINGS_LOCATION] = "~/.doesnotexist"
@@ -855,12 +852,6 @@
"{\"message\": \"Tree is throttled\"}"),
URL("https://v8-status.appspot.com/lkgr";, Exception("Network
problem")),
URL("https://v8-status.appspot.com/lkgr";, "100"),
- URL("https://v8-status.appspot.com/status";,
- ("username=v8-auto-roll%40chromium.org&"
- "message=Tree+is+closed+%28preparing+to+push%29&password=PW"), ""),
- URL("https://v8-status.appspot.com/status";,
- ("username=v8-auto-roll%40chromium.org&"
- "message=Tree+is+throttled&password=PW"), ""),
])
self.ExpectGit([
@@ -874,18 +865,17 @@
"Version 3.4.5 (based on bleeding_edge revision r79)\n"),
])
- auto_roll.AutoRoll(TEST_CONFIG, self).Run(
- AUTO_ROLL_ARGS + ["--status-password", password, "--push"])
+ auto_push.AutoPush(TEST_CONFIG, self).Run(AUTO_PUSH_ARGS + ["--push"])
state = json.loads(FileToText("%s-state.json"
% TEST_CONFIG[PERSISTFILE_BASENAME]))
self.assertEquals("100", state["lkgr"])
- def testAutoRollStoppedBySettings(self):
+ def testAutoPushStoppedBySettings(self):
TEST_CONFIG[DOT_GIT_LOCATION] = self.MakeEmptyTempFile()
TEST_CONFIG[SETTINGS_LOCATION] = self.MakeEmptyTempFile()
- TextToFile("{\"enable_auto_roll\": false}",
TEST_CONFIG[SETTINGS_LOCATION])
+ TextToFile("{\"enable_auto_push\": false}",
TEST_CONFIG[SETTINGS_LOCATION])
self.ExpectReadURL([])
@@ -895,11 +885,11 @@
Git("svn fetch", ""),
])
- def RunAutoRoll():
- auto_roll.AutoRoll(TEST_CONFIG, self).Run(AUTO_ROLL_ARGS)
- self.assertRaises(Exception, RunAutoRoll)
+ def RunAutoPush():
+ auto_push.AutoPush(TEST_CONFIG, self).Run(AUTO_PUSH_ARGS)
+ self.assertRaises(Exception, RunAutoPush)
- def testAutoRollStoppedByTreeStatus(self):
+ def testAutoPushStoppedByTreeStatus(self):
TEST_CONFIG[DOT_GIT_LOCATION] = self.MakeEmptyTempFile()
TEST_CONFIG[SETTINGS_LOCATION] = "~/.doesnotexist"
@@ -914,9 +904,9 @@
Git("svn fetch", ""),
])
- def RunAutoRoll():
- auto_roll.AutoRoll(TEST_CONFIG, self).Run(AUTO_ROLL_ARGS)
- self.assertRaises(Exception, RunAutoRoll)
+ def RunAutoPush():
+ auto_push.AutoPush(TEST_CONFIG, self).Run(AUTO_PUSH_ARGS)
+ self.assertRaises(Exception, RunAutoPush)
def testMergeToBranch(self):
TEST_CONFIG[ALREADY_MERGING_SENTINEL_FILE] = self.MakeEmptyTempFile()
--
--
v8-dev mailing list
[email protected]
http://groups.google.com/group/v8-dev
---
You received this message because you are subscribed to the Google Groups "v8-dev" group.
To unsubscribe from this group and stop receiving emails from it, send an email
to [email protected].
For more options, visit https://groups.google.com/d/optout.
