Commit 9a048b1b authored by Rémi Duraffort's avatar Rémi Duraffort

Remove deprecated support for json job definition

Every users should use a proper yaml job definition. This is taking CPU time
for no reason.
Signed-off-by: Rémi Duraffort's avatarRémi Duraffort <remi.duraffort@linaro.org>
parent 5b6c3281
Pipeline #5295 passed with stages
in 16 minutes and 2 seconds
......@@ -29,7 +29,6 @@ import contextlib
import os
import yaml
import jinja2
import json
import logging
from nose.tools import nottest
......@@ -117,17 +116,6 @@ def testjob_submission(job_definition, user, original_job=None):
DeviceType.DoesNotExist, DevicesUnavailableException,
ValueError
"""
json_data = True
try:
# accept JSON but store as YAML
json.loads(job_definition)
except json.decoder.JSONDecodeError:
json_data = False
if json_data:
# explicitly convert to YAML.
# JSON cannot have comments anyway.
job_definition = yaml.safe_dump(yaml.safe_load(job_definition))
validate_job(job_definition)
# returns a single job or a list (not a QuerySet) of job objects.
job = TestJob.from_yaml_and_user(job_definition, user, original_job=original_job)
......
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