Fixing merge conflict errors
This should help LAVA job submissions amongst other areas.
Change-Id: I2e4b154ea63c30b38bc0d681adbe2416275170f0
diff --git a/tfm_ci_pylib/lava_rpc_connector.py b/tfm_ci_pylib/lava_rpc_connector.py
index d954d64..ac22774 100644
--- a/tfm_ci_pylib/lava_rpc_connector.py
+++ b/tfm_ci_pylib/lava_rpc_connector.py
@@ -179,9 +179,12 @@
print(e)
return None, None
try:
- job_id = self.scheduler.submit_job(job_data)
- job_url = self.server_job_prefix % job_id
- return(job_id, job_url)
+ if self.has_device_type(job_data):
+ job_id = self.scheduler.submit_job(job_data)
+ job_url = self.server_job_prefix % job_id
+ return(job_id, job_url)
+ else:
+ raise Exception("No devices online with required device_type")
except Exception as e:
print(e)
return(None, None)