From faccf39fe074b9acbd4d39fa4dc6154e70ed42ad Mon Sep 17 00:00:00 2001
From: Ravi Mistry <rmistry@google.com>
Date: Thu, 19 Jul 2018 08:43:11 -0400
Subject: Debug nightly bookmaker bot

* Output fiddle.json
* Do not send to CQ while we investigate

Bug: skia:8151
Change-Id: I309c732cc6b7db72054fd119b8c68dd32a765d6f
Reviewed-on: https://skia-review.googlesource.com/142301
Commit-Queue: Ravi Mistry <rmistry@google.com>
Reviewed-by: Cary Clark <caryclark@google.com>
---
 .../bots/recipes/bookmaker.expected/nightly_bookmaker.json | 14 ++++++++++++++
 .../bookmaker.expected/nightly_failed_fiddlecli.json       | 14 ++++++++++++++
 .../recipes/bookmaker.expected/nightly_failed_fiddles.json | 14 ++++++++++++++
 .../recipes/bookmaker.expected/nightly_failed_upload.json  | 14 ++++++++++++++
 infra/bots/recipes/bookmaker.py                            |  4 ++++
 infra/bots/upload_md.py                                    |  2 +-
 6 files changed, 61 insertions(+), 1 deletion(-)

(limited to 'infra')

diff --git a/infra/bots/recipes/bookmaker.expected/nightly_bookmaker.json b/infra/bots/recipes/bookmaker.expected/nightly_bookmaker.json
index 037bd507bf..da3af89cdf 100644
--- a/infra/bots/recipes/bookmaker.expected/nightly_bookmaker.json
+++ b/infra/bots/recipes/bookmaker.expected/nightly_bookmaker.json
@@ -152,6 +152,20 @@
     },
     "name": "Extract all fiddles out of md files"
   },
+  {
+    "cmd": [
+      "cat",
+      "[START_DIR]/fiddle.json"
+    ],
+    "cwd": "[START_DIR]/cache/work/skia",
+    "env": {
+      "CHROME_HEADLESS": "1",
+      "GOPATH": "[START_DIR]/gopath",
+      "GOROOT": "[START_DIR]/go/go",
+      "PATH": "[START_DIR]/go/go/bin:[START_DIR]/gopath:<PATH>:RECIPE_PACKAGE_REPO[depot_tools]"
+    },
+    "name": "Output fiddle.json"
+  },
   {
     "cmd": [
       "[START_DIR]/gopath/bin/fiddlecli",
diff --git a/infra/bots/recipes/bookmaker.expected/nightly_failed_fiddlecli.json b/infra/bots/recipes/bookmaker.expected/nightly_failed_fiddlecli.json
index 7561fffb72..809237cd75 100644
--- a/infra/bots/recipes/bookmaker.expected/nightly_failed_fiddlecli.json
+++ b/infra/bots/recipes/bookmaker.expected/nightly_failed_fiddlecli.json
@@ -152,6 +152,20 @@
     },
     "name": "Extract all fiddles out of md files"
   },
+  {
+    "cmd": [
+      "cat",
+      "[START_DIR]/fiddle.json"
+    ],
+    "cwd": "[START_DIR]/cache/work/skia",
+    "env": {
+      "CHROME_HEADLESS": "1",
+      "GOPATH": "[START_DIR]/gopath",
+      "GOROOT": "[START_DIR]/go/go",
+      "PATH": "[START_DIR]/go/go/bin:[START_DIR]/gopath:<PATH>:RECIPE_PACKAGE_REPO[depot_tools]"
+    },
+    "name": "Output fiddle.json"
+  },
   {
     "cmd": [
       "[START_DIR]/gopath/bin/fiddlecli",
diff --git a/infra/bots/recipes/bookmaker.expected/nightly_failed_fiddles.json b/infra/bots/recipes/bookmaker.expected/nightly_failed_fiddles.json
index dfb0083440..1907a1153c 100644
--- a/infra/bots/recipes/bookmaker.expected/nightly_failed_fiddles.json
+++ b/infra/bots/recipes/bookmaker.expected/nightly_failed_fiddles.json
@@ -152,6 +152,20 @@
     },
     "name": "Extract all fiddles out of md files"
   },
+  {
+    "cmd": [
+      "cat",
+      "[START_DIR]/fiddle.json"
+    ],
+    "cwd": "[START_DIR]/cache/work/skia",
+    "env": {
+      "CHROME_HEADLESS": "1",
+      "GOPATH": "[START_DIR]/gopath",
+      "GOROOT": "[START_DIR]/go/go",
+      "PATH": "[START_DIR]/go/go/bin:[START_DIR]/gopath:<PATH>:RECIPE_PACKAGE_REPO[depot_tools]"
+    },
+    "name": "Output fiddle.json"
+  },
   {
     "cmd": [
       "[START_DIR]/gopath/bin/fiddlecli",
diff --git a/infra/bots/recipes/bookmaker.expected/nightly_failed_upload.json b/infra/bots/recipes/bookmaker.expected/nightly_failed_upload.json
index ad463720b2..3269bde50b 100644
--- a/infra/bots/recipes/bookmaker.expected/nightly_failed_upload.json
+++ b/infra/bots/recipes/bookmaker.expected/nightly_failed_upload.json
@@ -152,6 +152,20 @@
     },
     "name": "Extract all fiddles out of md files"
   },
+  {
+    "cmd": [
+      "cat",
+      "[START_DIR]/fiddle.json"
+    ],
+    "cwd": "[START_DIR]/cache/work/skia",
+    "env": {
+      "CHROME_HEADLESS": "1",
+      "GOPATH": "[START_DIR]/gopath",
+      "GOROOT": "[START_DIR]/go/go",
+      "PATH": "[START_DIR]/go/go/bin:[START_DIR]/gopath:<PATH>:RECIPE_PACKAGE_REPO[depot_tools]"
+    },
+    "name": "Output fiddle.json"
+  },
   {
     "cmd": [
       "[START_DIR]/gopath/bin/fiddlecli",
diff --git a/infra/bots/recipes/bookmaker.py b/infra/bots/recipes/bookmaker.py
index 9d344001f9..4c7fa99baf 100644
--- a/infra/bots/recipes/bookmaker.py
+++ b/infra/bots/recipes/bookmaker.py
@@ -78,6 +78,10 @@ def RunSteps(api):
              ]
       api.run(api.step, 'Extract all fiddles out of md files', cmd=cmd)
 
+      # Output fiddle.json for easy debugging.
+      api.run(api.step, 'Output fiddle.json',
+              cmd=['cat', fiddlecli_input])
+
       # Step 2: Forces fiddle.skia.org to compile all fiddles extracted out of
       #         markdown files and get output in JSON.
       cmd = [fiddlecli_binary,
diff --git a/infra/bots/upload_md.py b/infra/bots/upload_md.py
index 2632a32ef6..302df4adf6 100644
--- a/infra/bots/upload_md.py
+++ b/infra/bots/upload_md.py
@@ -33,7 +33,7 @@ def main():
   with git_utils.NewGitCheckout(repository=SKIA_REPO):
     with git_utils.GitBranch(branch_name='update_md_files',
                              commit_msg=COMMIT_MSG,
-                             commit_queue=True,
+                             commit_queue=False,
                              upload=False,
                              cc_list=CC_LIST) as git_branch:
       # Run bookmaker binary.
-- 
cgit v1.2.3