Do not hardcode lava_job_info_orig file path
diff --git a/lava-submit.py b/lava-submit.py
index 2321767..d328f8d 100755
--- a/lava-submit.py
+++ b/lava-submit.py
@@ -225,21 +225,24 @@
'job_id': lava_job_id},
open('lava-job-info', 'w'))
- lava_job_info_orig = ("daily-prebuilt-images/out/pre-built/%s/%s/%s" % \
- (hwpack_type, \
- hwpack_build_number, \
- hwpack_file_name)).replace(".img.gz", ".html")
- with open(lava_job_info_orig) as f:
- buffer = f.read()
+ lava_job_info_orig = hwpack_file_name.replace(".img.gz", ".html")
+ top_dir = os.environ.get("WORKSPACE", ".")
+ for root, dirs, files in os.walk(top_dir):
+ for file in files:
+ if file == lava_job_info_orig:
+ lava_job_info_orig = os.path.join(root, file)
- buffer = buffer.replace("var lavaJobId = 0", \
- "var lavaJobId = " + str(lava_job_id), 1)
+ with open(lava_job_info_orig) as f:
+ buffer = f.read()
- lava_job_info = lava_job_info_orig.replace(".html",\
- "-" + device_type + ".html")
- with open(lava_job_info, 'w') as f:
- f.write(buffer)
- os.remove(lava_job_info_orig)
+ buffer = buffer.replace("var lavaJobId = 0", \
+ "var lavaJobId = " + str(lava_job_id), 1)
+
+ lava_job_info = lava_job_info_orig.replace(".html",\
+ "-" + device_type + ".html")
+ with open(lava_job_info, 'w') as f:
+ f.write(buffer)
+ os.remove(lava_job_info_orig)
else:
print "LAVA job submission skipped."