Merge lp:~liuyq0307/linaro-android-build-tools/support-http into lp:linaro-android-build-tools

[Yongqin Liu]

1. Add support to submit job to non-https lava-server instances
2. Change to use LAVA_TOKEN_FILE instead of LAVA_TOKEN to get the token information

[lp:~liuyq0307/linaro-android-build-tools/support-http]

500. By Yongqin Liu on 2012-08-13

also change the url for submit result

[Paul Sokolovsky (pfalcon)]

This looks pretty good, thanks for making sure that proper URL schema is used throughout.

The only problem is at line 48. I proposed that value of LAVA_TOKEN_FILE would be just a filename of file containing a token, relative to the predefined dir (/var/run/lava/), not absolute path name. I don't think it's worth to expose full path name to lava tokens in the public build configs.

review: Needs Fixing

[lp:~liuyq0307/linaro-android-build-tools/support-http]

501. By Yongqin Liu on 2012-08-14

merge with trunk

502. By Yongqin Liu on 2012-08-14

update according to the review comment that the LAVA_TOKEN_FILE should be just the file name that no including the dir path information

Unmerged revisions

=== modified file 'build-scripts/post-build-lava.py'
--- build-scripts/post-build-lava.py	2012-08-13 05:32:23 +0000
+++ build-scripts/post-build-lava.py	2012-08-14 04:03:19 +0000
@@ -237,6 +237,21 @@
         print "Don't know how to test this board. Skip testing."
         return
 
+    lava_server = os.environ.get("LAVA_SERVER")
+    if lava_server == None:
+        schema = 'https'
+        url_no_schema = "validation.linaro.org/lava-server/RPC2/"
+    elif lava_server.find('://') >= 0:
+        schema = lava_server[:lava_server.find('://')]
+        url_no_schema = lava_server[lava_server.find('://') + len('://'):]
+    else:
+        ## the case that no https and http specified in the url
+        ## like: validation.linaro.org/lava-server/RPC2/
+        schema = 'https'
+        url_no_schema = lava_server #for compare with above condition
+    schema_url = '%s://%s' % (schema, url_no_schema)
+    lava_server = url_no_schema
+
     lava_user = os.environ.get("LAVA_USER")
     if lava_user == None:
         f = open('/var/run/lava/lava-user')
@@ -279,7 +294,7 @@
       "command": "submit_results_on_host",
       "parameters":
       {
-        "server": "http://validation.linaro.org/lava-server/RPC2/",
+        "server": schema_url,
         "stream": PRODUCT_MAP[target_product].get(
               "test_stream", default_stream)
       }
@@ -310,21 +325,23 @@
 
     print config
 
-    lava_token = os.environ.get("LAVA_TOKEN")
-    if lava_token == None:
-        f = open('/var/run/lava/lava-token')
-        lava_token = f.read().strip()
-        f.close()
+    lava_token_f = os.environ.get("LAVA_TOKEN_FILE")
+    if lava_token_f == None:
+        lava_token_f = '/var/run/lava/lava-token'
+    else:
+        lava_token_f = '/var/run/lava/%s' % lava_token_f
 
-    lava_server = os.environ.get("LAVA_SERVER")
-    if lava_server == None:
-        lava_server = "validation.linaro.org/lava-server/RPC2/"
+    with open(lava_token_f) as fd:
+        lava_token = fd.read().strip()
 
     try:
-        server = xmlrpclib.ServerProxy(
-            "https://%(lava_user)s:%(lava_token)s@%(lava_server)s" % \
-            dict(lava_user=lava_user, lava_token=lava_token,
-                 lava_server=lava_server))
+        report_url = ("%(schema)s://"
+             "%(lava_user)s:%(lava_token)s@%(lava_server)s") % dict(
+                                    schema=schema,
+                                    lava_user=lava_user,
+                                    lava_token=lava_token,
+                                    lava_server=lava_server)
+        server = xmlrpclib.ServerProxy(report_url)
         lava_job_id = server.scheduler.submit_job(config)
         lava_server_root = lava_server.rstrip("/")
         if lava_server_root.endswith("/RPC2"):
@@ -333,11 +350,11 @@
         print "Error making a LAVA request:", obfuscate_credentials(str(e))
         sys.exit(1)
 
-    print "LAVA Job Id: %s, URL: http://%s/scheduler/job/%s" % \
-    (lava_job_id, lava_server_root, lava_job_id)
+    print "LAVA Job Id: %s, URL: %s://%s/scheduler/job/%s" % \
+    (lava_job_id, schema, lava_server_root, lava_job_id)
 
     json.dump({
-        'lava_url': "http://" + lava_server_root,
+        'lava_url': "%s://%s" % (schema, lava_server_root),
         'job_id': lava_job_id,
         }, open('out/lava-job-info', 'w'))