diff options
| author |  borenet <borenet@chromium.org> | 2016-09-30 12:18:47 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2016-09-30 12:18:47 -0700 |
| commit | d5603e670b5069907406d95eb6622835df1010df (patch) | |
| tree | c1f35cb14a0be923a745cee161ca3f246dc86928 /infra/bots | |
| parent | b3480e1cb71b2ddf2a4aa8fa03e18449d38f9e1c (diff) | |
upload_dm_results: Remove JSON validation step
This is infra-failing frequently for some reason, possibly due to large
file size?
TBR=stephana
BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2383163002
Review-Url: https://codereview.chromium.org/2383163002
Diffstat (limited to 'infra/bots')
4 files changed, 1 insertions, 46 deletions
diff --git a/infra/bots/recipes/upload_dm_results.expected/normal_bot.json b/infra/bots/recipes/upload_dm_results.expected/normal_bot.json index 8b35adc182..29fdb33ed9 100644 --- a/infra/bots/recipes/upload_dm_results.expected/normal_bot.json +++ b/infra/bots/recipes/upload_dm_results.expected/normal_bot.json @@ -3,20 +3,6 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "[CWD]/dm/dm.json", - "/path/to/tmp/json" - ], - "name": "validate dm.json", - "~followup_annotations": [ - "@@@STEP_LOG_LINE@json.output (invalid)@null@@@", - "@@@STEP_LOG_END@json.output (invalid)@@@" - ] - }, - { - "cmd": [ - "python", - "-u", "\nimport sys, os\npath = sys.argv[1]\nmode = int(sys.argv[2])\nif not os.path.isdir(path):\n if os.path.exists(path):\n print \"%s exists but is not a dir\" % path\n sys.exit(1)\n os.makedirs(path, mode)\n", "[CWD]/tmp_upload", "511" diff --git a/infra/bots/recipes/upload_dm_results.expected/recipe_with_gerrit_patch.json b/infra/bots/recipes/upload_dm_results.expected/recipe_with_gerrit_patch.json index 29a618c7c1..4235230dc0 100644 --- a/infra/bots/recipes/upload_dm_results.expected/recipe_with_gerrit_patch.json +++ b/infra/bots/recipes/upload_dm_results.expected/recipe_with_gerrit_patch.json @@ -3,20 +3,6 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "[CWD]/dm/dm.json", - "/path/to/tmp/json" - ], - "name": "validate dm.json", - "~followup_annotations": [ - "@@@STEP_LOG_LINE@json.output (invalid)@null@@@", - "@@@STEP_LOG_END@json.output (invalid)@@@" - ] - }, - { - "cmd": [ - "python", - "-u", "\nimport sys, os\npath = sys.argv[1]\nmode = int(sys.argv[2])\nif not os.path.isdir(path):\n if os.path.exists(path):\n print \"%s exists but is not a dir\" % path\n sys.exit(1)\n os.makedirs(path, mode)\n", "[CWD]/tmp_upload", "511" diff --git a/infra/bots/recipes/upload_dm_results.expected/trybot.json b/infra/bots/recipes/upload_dm_results.expected/trybot.json index ced83e6861..622f0d5954 100644 --- a/infra/bots/recipes/upload_dm_results.expected/trybot.json +++ b/infra/bots/recipes/upload_dm_results.expected/trybot.json @@ -3,20 +3,6 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "[CWD]/dm/dm.json", - "/path/to/tmp/json" - ], - "name": "validate dm.json", - "~followup_annotations": [ - "@@@STEP_LOG_LINE@json.output (invalid)@null@@@", - "@@@STEP_LOG_END@json.output (invalid)@@@" - ] - }, - { - "cmd": [ - "python", - "-u", "\nimport sys, os\npath = sys.argv[1]\nmode = int(sys.argv[2])\nif not os.path.isdir(path):\n if os.path.exists(path):\n print \"%s exists but is not a dir\" % path\n sys.exit(1)\n os.makedirs(path, mode)\n", "[CWD]/tmp_upload", "511" diff --git a/infra/bots/recipes/upload_dm_results.py b/infra/bots/recipes/upload_dm_results.py index 49dc2ac505..6d1b0eacd0 100644 --- a/infra/bots/recipes/upload_dm_results.py +++ b/infra/bots/recipes/upload_dm_results.py @@ -42,11 +42,8 @@ def RunSteps(api): results_dir = api.path['cwd'].join('dm') - # Validate the JSON file. - json_file = results_dir.join(DM_JSON) - api.json.read('validate dm.json', json_file) - # Move dm.json and verbose.log to their own directory. + json_file = results_dir.join(DM_JSON) log_file = results_dir.join(VERBOSE_LOG) tmp_dir = api.path['cwd'].join('tmp_upload') api.shutil.makedirs('tmp dir', tmp_dir, infra_step=True) |