aboutsummaryrefslogtreecommitdiffhomepage
path: root/infra/bots/recipe_modules
diff options
context:
space:
mode:
authorGravatar borenet <borenet@chromium.org>2016-10-04 13:23:57 -0700
committerGravatar Commit bot <commit-bot@chromium.org>2016-10-04 13:23:57 -0700
commit777ee88129ae5432209378f861b92ccb52eb0ac4 (patch)
treef49ea547e95461ac35925ad295edcbc9e12083b2 /infra/bots/recipe_modules
parent511f2d79bf6ea0ee858a3468d3aa8dcbfca58648 (diff)
Make the housekeeper upload doxygen to a newer bucket
Diffstat (limited to 'infra/bots/recipe_modules')
-rwxr-xr-xinfra/bots/recipe_modules/core/resources/generate_and_upload_doxygen.py8
-rw-r--r--infra/bots/recipe_modules/vars/api.py2
2 files changed, 4 insertions, 6 deletions
diff --git a/infra/bots/recipe_modules/core/resources/generate_and_upload_doxygen.py b/infra/bots/recipe_modules/core/resources/generate_and_upload_doxygen.py
index f06ea96bc7..968f80debf 100755
--- a/infra/bots/recipe_modules/core/resources/generate_and_upload_doxygen.py
+++ b/infra/bots/recipe_modules/core/resources/generate_and_upload_doxygen.py
@@ -19,7 +19,7 @@ DOXYGEN_BINARY = 'doxygen'
WORKDIR = os.path.join(os.pardir, 'doxygen_workdir')
DOXYGEN_CONFIG_DIR = os.path.join(WORKDIR, 'doxygen-config')
DOXYGEN_WORKING_DIR = os.path.join(WORKDIR, 'doxygen')
-DOXYGEN_GS_PATH = '/'.join(['gs://chromium-skia-gm', 'doxygen'])
+DOXYGEN_GS_PATH = '/'.join(['gs://skia-doc', 'doxygen'])
IFRAME_FOOTER_TEMPLATE = """
<html><body><address style="text-align: right;"><small>
@@ -39,7 +39,7 @@ def recreate_dir(path):
os.makedirs(path)
-def generate_and_upload_doxygen(gsutil_path):
+def generate_and_upload_doxygen():
"""Generate Doxygen."""
# Create empty dir and add static_footer.txt
recreate_dir(DOXYGEN_WORKING_DIR)
@@ -65,11 +65,11 @@ def generate_and_upload_doxygen(gsutil_path):
subprocess.check_output([DOXYGEN_BINARY, '--version']).rstrip()))
# Upload.
- cmd = [gsutil_path, 'cp', '-a', 'public-read', '-R',
+ cmd = ['gsutil', 'cp', '-a', 'public-read', '-R',
DOXYGEN_WORKING_DIR, DOXYGEN_GS_PATH]
subprocess.check_call(cmd)
if '__main__' == __name__:
- generate_and_upload_doxygen(*sys.argv[1:])
+ generate_and_upload_doxygen()
diff --git a/infra/bots/recipe_modules/vars/api.py b/infra/bots/recipe_modules/vars/api.py
index 5786d436bf..f593ff1bef 100644
--- a/infra/bots/recipe_modules/vars/api.py
+++ b/infra/bots/recipe_modules/vars/api.py
@@ -9,8 +9,6 @@
from recipe_engine import recipe_api
-BOTO_CHROMIUM_SKIA_GM = 'chromium-skia-gm.boto'
-
CONFIG_DEBUG = 'Debug'
CONFIG_RELEASE = 'Release'