Merge lp:~fgiff/linaro-android-build-tools/linaro-android-connect-android-build-to-lava into lp:linaro-android-build-tools

[Frans Gifford]

Connect the Android Builder to LAVA

[Frans Gifford (fgiff)]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

 reviewer pfefferz
 reviewer plars
 reviewer asac
 reviewer mwhudson
 reviewer james-w
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.11 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/

iQEcBAEBAgAGBQJOFLjuAAoJEAeFjc2hVnFUUQYIANMRXQ6uQXGEtf0p85a0d1Lv
2WAEZvQt1Fmv3ty3x9MH9DJmss8q92Et3hiOMR/tgVzLqpJdgMF6S3+5DkOst43u
MjnhkXi74PLpAskUmr9SRn3cKWPASzQ8z2PEVmMQQ2nyDUPcLU/OVjYYH9//lpwF
6rid9k9D2UukbVieWyV8wLntm66CoJMFhifyyitt9MFZqdoLp/soOdGFVPq5iLvs
1PtTrYbaENya1GXx4onW1mbetjQkbKmjcyS+bd7RJmj5iY4RfLTlxDwIO/yxxzT1
wTuXrvhBBt60XwPRKCxxqYcjDXPcUQ2S41fY51dyDWeKqrea/B2PZ4sGZFkJPwU=
=iRKu
-----END PGP SIGNATURE-----

[James Westby (james-w)]

18 + if job_name == "linaro-android_leb-panda":

I would think that this would be better using TARGET_PRODUCT wouldn't it?

That way we don't have to edit the script for every job added.

It would mean basing the stream name on the job name as I suggested, but I don't
know if Paul L. thinks that's a good idea.

30 + "job_name": "''' + build_url + '''",

You might prefer string interpolation rather than concatenation:

  print """{"job_name": "%(build_url)s"}""" % dict(build_url=build_url)

or to do it using the json module:

  import json
  config = {"job_name": build_url}
  print json.dumps(config)

I think that they will be a bit easier to modify, and this is going to
see plenty of modifications.

Up to you though.

Lastly convention is for four space indent rather than two.

Thanks,

James

review: Approve

[James Westby (james-w)]

Oh, and I think there should be a toggle so that we can turn off submission if we want
to while testing. That should maybe be decided by the caller though?

Thanks,

James

[Paul Sokolovsky (pfalcon)]

I agree about usage of json module. My idea was also that this script should take values it needs from the environment, not on command line, then it would be more flexible. For example, regarding toggle James talks about - I guess, for starters, we'd want to enable submission feature just for few selected jobs, so the script could check for LAVA_SUBMIT=1 var. Later, we may want to have it enabled by default and have switch to disable it instead. This all can be done in the script itself.

Anyway, current idea is to provide you with a sandbox, where you can test/tweak such integration issues (more info in email).

review: Approve

[lp:~fgiff/linaro-android-build-tools/linaro-android-connect-android-build-to-lava]

283. By Frans Gifford on 2011-07-07

Interim checkin

284. By Frans Gifford on 2011-07-07

Using JSON module

285. By Frans Gifford on 2011-07-07

Added LAVA_SUBMIT env flag

286. By Frans Gifford on 2011-07-07

Added LAVA_SUBMIT env flag

[Frans Gifford (fgiff)]

OK, I've updated to:

 use the JSON module.
 use a LAVA_SUBMIT environment variable to toggle output.
 read environment variables from env instead of command line.
 use 4-space indent.

I'll try it out in the sandbox now.

[James Westby (james-w)]

72 + if os.environ.get("LAVA_SUBMIT") > 0:
73 + main()

I think you need to wrap the get in an int() to get LAVA_SUBMIT=0 to work,
as it returns a string.

I think this is ok to land and hook in to the build.

Thanks,

James

review: Approve

[Paul Sokolovsky (pfalcon)]

On Thu, 07 Jul 2011 14:56:37 -0000
James Westby <email address hidden> wrote:

> I think this is ok to land and hook in to the build.

I've created ec2-184-73-120-120.compute-1.amazonaws.com sandbox for
Frans to use, and it is set up to fetch binutils from his branch. So, I
guess it makes sense to let him do complete integration work (up to
some milestone of course) in his branch (he can test it right away), and
then merge it, so I skip merging this patch now.

--
Best Regards,
Paul

[Michael Hudson-Doyle (mwhudson)]

I share the concern that defining the mapping between thing that was built and the tests to run and the stream to submit to by hardcoding it in this file is not that great, but we don't really have anything else yet and it's easy to change to something better later. Otherwise, looks fine enough to me.

review: Approve

[lp:~fgiff/linaro-android-build-tools/linaro-android-connect-android-build-to-lava]

287. By Frans Gifford on 2011-07-08

Call post-build-lava.py from build-script.
Base stream and board on target_product, not job.

288. By Frans Gifford on 2011-07-10

Update path to post-build-lava.py

289. By Frans Gifford on 2011-07-10

Add some logging

290. By Frans Gifford on 2011-07-11

See if build server dislikes test syntax

291. By Frans Gifford on 2011-07-11

Debugging

292. By Frans Gifford on 2011-07-12

Remove redundant path separator.

293. By Frans Gifford on 2011-07-19

Updated syntax for 0xbench to conform to https://wiki.linaro.org/Platform/Validation/LAVA/Documentation

294. By Frans Gifford on 2011-07-25

Added call into LAVA

295. By Frans Gifford on 2011-07-25

Adding call to LAVA

296. By Frans Gifford on 2011-07-25

Fix bug if LAVA_SERVER not specified

297. By Frans Gifford on 2011-07-26

Fixed up lava submission

298. By Frans Gifford on 2011-07-26

Submit to lava from python and add beagleboard

299. By Frans Gifford on 2011-07-26

Removed testing placeholders

300. By Frans Gifford on 2011-07-26

Syntax cleanup

301. By Frans Gifford on 2011-07-26

Use files on server to authenticate to lava rather than environment vars

302. By Frans Gifford on 2011-07-26

Use device_type so validation can load balance boards

Unmerged revisions

=== modified file 'build-scripts/build-android'
--- build-scripts/build-android	2011-06-03 16:29:06 +0000
+++ build-scripts/build-android	2011-07-26 13:34:55 +0000
@@ -51,3 +51,8 @@
     toolchain-build/build-sysroot.sh out/target/product/`ls -1 out/target/product | head -n1` /tmp/sysroot
     tar -cj -C /tmp/sysroot -f out/sysroot.tar.bz2 .
 fi
+
+if test -n "$LAVA_SUBMIT"; then
+    "${BUILD_SCRIPT_ROOT}"/post-build-lava.py
+fi
+

=== added file 'build-scripts/post-build-lava.py'
--- build-scripts/post-build-lava.py	1970-01-01 00:00:00 +0000
+++ build-scripts/post-build-lava.py	2011-07-26 13:34:55 +0000
@@ -0,0 +1,102 @@
+#!/usr/bin/env python
+import os
+import json
+import xmlrpclib
+
+def main():
+    """Script entry point: return some JSON based on calling args.
+    We should be called from Jenkins and expect the following to 
+    be defined: $TARGET_PRODUCT $JOB_NAME $BUILD_NUMBER $BUILD_URL"""
+
+    # Target product name, user defined, e.g. pandaboard
+    target_product=os.environ.get("TARGET_PRODUCT")
+    # Job name, defined by android-build, e.g. linaro-android_leb-panda
+    job_name=os.environ.get("JOB_NAME")
+    # Build number, defined by android-build, e.g. 61
+    build_number=os.environ.get("BUILD_NUMBER")
+    # Build url, defined by android-build, e.g. 
+    # https://android-build.linaro.org/jenkins/job/linaro-android_leb-panda/61/
+    build_url=os.environ.get("BUILD_URL")
+    test_plan=os.environ.get("LAVA_TEST_PLAN")
+    if test_plan == None:
+        test_plan="test_android_0xbench"
+    
+    # Board-specific parameters
+    if target_product == "pandaboard":
+        # Board to test on. Let validation worry about load balancing.
+        # TODO: Validation are working on removing the need for this parameter.
+        test_target="panda01"
+        test_stream="/anonymous/android-daily/"
+    elif target_product == "beagleboard":
+        test_target="beaglexm01"
+        test_stream="/anonymous/android-daily/"
+    #elif target_product == ---> Add other boards here
+    else:
+        #TODO: We don't know how to test this job, so skip testing.
+        print "Don't know how to test this board. Skip testing."
+        return
+
+    config = json.dumps( { "job_name": build_url,
+ "image_type": "android",
+ "target": test_target,
+ "timeout": 18000,
+ "actions": [
+  {
+    "command": "deploy_linaro_android_image",
+    "parameters":
+      {
+        "boot":
+build_url + "artifact/build/out/target/product/" + target_product + "/boot.tar.bz2",
+        "system":
+build_url + "artifact/build/out/target/product/" + target_product + "/system.tar.bz2",
+        "data":
+build_url + "artifact/build/out/target/product/" + target_product + "/userdata.tar.bz2"
+      },
+    "metadata":
+      {
+        "android.name": job_name, 
+        "android.build": build_number, 
+        "android.url": build_url
+      } 
+  },
+  {
+    "command": "boot_linaro_android_image"
+  },
+  {
+    "command": test_plan
+  },
+  {
+    "command": "submit_results",
+    "parameters":
+      {
+        "result_disk": "sdcard",
+        "server": "http://validation.linaro.org/lava-server/dashboard",
+        "stream": test_stream
+      }
+  }
+ ]
+}, indent=4)
+
+    print config
+    lava_user=os.environ.get("LAVA_USER")
+    if lava_user == None:
+        print "ERROR: No LAVA_USER specified."
+        return
+
+    lava_token=os.environ.get("LAVA_TOKEN")
+    if lava_token == None:
+        print "ERROR: No LAVA_TOKEN specified."
+        return
+
+    lava_server=os.environ.get("LAVA_SERVER")
+    if lava_server == None:
+        lava_server="validation.linaro.org/lava-server/RPC2/"
+
+    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))
+    server.scheduler.submit_job(config)
+
+if __name__ == "__main__":
+    if os.environ.get("LAVA_SUBMIT") > 0:
+        main()
+