Commit 48df1ecf authored by Caleb Rouleau's avatar Caleb Rouleau Committed by Commit Bot

[Speed Automation] Add project id to bigquery command.

Without this flag, I get the error:

Stdout: BigQuery error in query operation: Cannot start a job without a project id.
Change-Id: I2480e312dc8934fa8d3f4de215bbb8803a98f6cc
Reviewed-on: https://chromium-review.googlesource.com/c/1366937Reviewed-by: default avatarNed Nguyen <nednguyen@google.com>
Commit-Queue: Caleb Rouleau <crouleau@chromium.org>
Cr-Commit-Position: refs/heads/master@{#614766}
parent d132ff54
...@@ -10,12 +10,13 @@ import subprocess ...@@ -10,12 +10,13 @@ import subprocess
import sys import sys
_CLOUD_PROJECT_ID = 'test-results-hrd'
QUERY_BY_BUILD_NUMBER = """ QUERY_BY_BUILD_NUMBER = """
SELECT SELECT
run.name AS name, run.name AS name,
SUM(run.times) AS duration SUM(run.times) AS duration
FROM FROM
[test-results-hrd:events.test_results] [%s:events.test_results]
WHERE WHERE
buildbot_info.builder_name IN ({}) buildbot_info.builder_name IN ({})
AND buildbot_info.build_number = {} AND buildbot_info.build_number = {}
...@@ -23,9 +24,7 @@ GROUP BY ...@@ -23,9 +24,7 @@ GROUP BY
name name
ORDER BY ORDER BY
name name
""" """ % _CLOUD_PROJECT_ID
QUERY_STORY_AVG_RUNTIME = """ QUERY_STORY_AVG_RUNTIME = """
SELECT SELECT
name, name,
...@@ -36,7 +35,7 @@ FROM ( ...@@ -36,7 +35,7 @@ FROM (
start_time, start_time,
AVG(run.times) AS time AVG(run.times) AS time
FROM FROM
[test-results-hrd:events.test_results] [%s:events.test_results]
WHERE WHERE
buildbot_info.builder_name IN ({configuration_names}) buildbot_info.builder_name IN ({configuration_names})
AND run.time IS NOT NULL AND run.time IS NOT NULL
...@@ -52,8 +51,7 @@ GROUP BY ...@@ -52,8 +51,7 @@ GROUP BY
name name
ORDER BY ORDER BY
name name
""" """ % _CLOUD_PROJECT_ID
QUERY_STORY_TOTAL_RUNTIME = """ QUERY_STORY_TOTAL_RUNTIME = """
SELECT SELECT
name, name,
...@@ -64,7 +62,7 @@ FROM ( ...@@ -64,7 +62,7 @@ FROM (
start_time, start_time,
SUM(run.times) AS time SUM(run.times) AS time
FROM FROM
[test-results-hrd:events.test_results] [%s:events.test_results]
WHERE WHERE
buildbot_info.builder_name IN ({configuration_names}) buildbot_info.builder_name IN ({configuration_names})
AND run.time IS NOT NULL AND run.time IS NOT NULL
...@@ -80,7 +78,7 @@ GROUP BY ...@@ -80,7 +78,7 @@ GROUP BY
name name
ORDER BY ORDER BY
name name
""" """ % _CLOUD_PROJECT_ID
_BQ_SETUP_INSTRUCTION = """ _BQ_SETUP_INSTRUCTION = """
...@@ -105,7 +103,8 @@ def _run_query(query): ...@@ -105,7 +103,8 @@ def _run_query(query):
subprocess.check_call(['which', 'bq']) subprocess.check_call(['which', 'bq'])
except subprocess.CalledProcessError: except subprocess.CalledProcessError:
raise RuntimeError(_BQ_SETUP_INSTRUCTION) raise RuntimeError(_BQ_SETUP_INSTRUCTION)
args = ["bq", "query", "--format=json", "--max_rows=100000", query] args = ["bq", "query", "--project_id="+_CLOUD_PROJECT_ID, "--format=json",
"--max_rows=100000", query]
p = subprocess.Popen(args, stdout=subprocess.PIPE, stderr=subprocess.PIPE) p = subprocess.Popen(args, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
stdout, stderr = p.communicate() stdout, stderr = p.communicate()
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment