Merge lp:~deeptik/linaro-ci/use_precise_hwpacks_for_kernel_ci into lp:linaro-ci

[Deepti B. Kalakeri]

Switch daily kernel builds to Precise hwpacks

[Fathi Boudra (fboudra)]

Approved. For further improvements:
- it will be nice to have tests. It will make the review easier.
- the code could be simplified if you use Jenkins API to get latest successful build.

review: Approve

[Deepti B. Kalakeri (deeptik)]

On Thu, May 17, 2012 at 7:26 PM, Fathi Boudra <email address hidden>wrote:

> Review: Approve
>
> Approved. For further improvements:
> - it will be nice to have tests. It will make the review easier.
> - the code could be simplified if you use Jenkins API to get latest
> successful build.
>
>
Yes, I will add the tests sometime soon. I wanted this merge to go in ASAP
as I want to stop using oneiric.
Use latest successful build for.
I will merge the changes for now as you have approved. I will work further
if required and propose a new merge.

> --
>
> https://code.launchpad.net/~deeptik/linaro-ci/use_precise_hwpacks_for_kernel_ci/+merge/106143<https://code.launchpad.net/%7Edeeptik/linaro-ci/use_precise_hwpacks_for_kernel_ci/+merge/106143>
> You are the owner of
> lp:~deeptik/linaro-ci/use_precise_hwpacks_for_kernel_ci.
>

--
Thanks!!!
Deepti

=== modified file 'find_latest.py'
--- find_latest.py	2012-05-04 13:27:16 +0000
+++ find_latest.py	2012-05-17 13:12:17 +0000
@@ -3,7 +3,6 @@
 import shutil
 import urllib2
 import urlparse
-import re
 from datetime import datetime
 from download_content_yes_to_lic import LicenseProtectedFileFetcher
 
@@ -44,7 +43,7 @@
 
 def _get_filename(filelist):
     match = None
-    tgzpattern = re.compile('<a href="(?P<tgzfilename>[\w\-\.]+\.tar\.gz)"')
+    tgzpattern = re.compile('<a href="(?P<tgzfilename>[\w\-]+(?!\.config)\.tar\.gz)"')
     for match in tgzpattern.finditer(filelist):
         pass
     if match is None:
@@ -52,62 +51,44 @@
         return None
     return match.group('tgzfilename')
 
-def find_latest(url, extra):
+def find_latest(url):
     """Find the latest image at the specified url
 
     :param url: The base url to search
     :param extra: The extra path needed to complete the url
     """
     fetcher = LicenseProtectedFileFetcher()
-    builddates = fetcher.get(url)
-    dates = find_builds(builddates)
-    dates.sort()
-    try:
-        while dates:
-            lastdate = dates.pop()
-            lastdate = lastdate + "/"
-            path = urlparse.urljoin(url, lastdate)
-            builds = fetcher.get(path)
-            buildlist = find_builds(builds)
-            while buildlist:
-                lastbuild = buildlist.pop()
-                latesturl = os.path.join(path, lastbuild) + extra
-                content = fetcher.get(latesturl)
-                filename = _get_filename(content)
-                if filename:
-                    raise StopIteration()
-    except StopIteration:
-        pass
-    fetcher.close()
-    build_id = "%s.%s" % (lastdate,lastbuild)
+    latesturl = urlparse.urljoin(url, "latest")
+    latesturl = latesturl + "/"
+    content = fetcher.get(latesturl)
+    filename = _get_filename(content)
     tgz_url = os.path.join(latesturl, filename)
-    return build_id, tgz_url
+    fetcher.close()
+    return tgz_url
 
 def find_latest_rootfs(imgtype):
     """Find the latest root fs image and return the build_id and url
 
     :param imgtype: The short name of the image type.
     """
-    imageurl="http://snapshots.linaro.org/oneiric/linaro-o-%s/" % imgtype
-    extrapath="/images/tar/"
-    build_id, filename = find_latest(imageurl, extrapath)
-    return build_id, filename
+    imageurl="http://snapshots.linaro.org/precise/images/%s/" % imgtype
+    filename = find_latest(imageurl)
+    return filename
 
 def find_latest_hwpack(hwpack):
     """Find the latest hardware pack and return the build_id and url
 
     :param hwpack: The name of the hardware pack to look for.
     """
-    # There is no omap3 hwpacks generated by landing team, hence use 
-    # the default omap3 hwpack available.
-    if hwpack != 'omap3': 
-        url="http://snapshots.linaro.org/oneiric/lt-%s-oneiric/" % hwpack
+    # There is no omap3 and origen hwpacks generated for lt, 
+    # hence use the default omap3 and origen hwpack available.
+    #url="http://snapshots.linaro.org/oneiric/lt-%s-oneiric/" % hwpack
+    if hwpack != 'beagleboard' and hwpack != "origen": 
+        url="http://snapshots.linaro.org/precise/hwpacks/lt-%s/" % hwpack
     else:
-        url="http://snapshots.linaro.org/oneiric/%s-oneiric/" % hwpack
-
-    hwpackextra="/images/hwpack/"
-    build_id, filename = find_latest(url, hwpackextra)
-    return build_id, filename
+        url="http://snapshots.linaro.org/precise/hwpacks/%s/" % hwpack
+    filename = find_latest(url)
+    return filename
 
 def find_ci_builds(data):
     found = []

=== modified file 'get_latest_ci_hwpack'
--- get_latest_ci_hwpack	2012-05-15 11:23:04 +0000
+++ get_latest_ci_hwpack	2012-05-17 13:12:17 +0000
@@ -6,7 +6,7 @@
 import os
 import re
 import json
-from find_latest import find_latest_hwpack, find_latest_rootfs, find_ci_latest
+from find_latest import find_latest_rootfs, find_ci_latest
 
 hwpacktype = os.getenv("HWPACK_TYPE", "unknown")
 imagetype = os.getenv("ROOTFS_TYPE", "unknown")
@@ -43,7 +43,9 @@
 hwpack_url_path = os.path.join(hwpack_url_path, hwpack_dir_url)
 
 hwpack_url = find_ci_latest(hwpack_url_path)
-rootfs_id, rootfs_url = find_latest_rootfs(imagetype)
+rootfs_url = find_latest_rootfs(imagetype)
+rootfs_name, rootfsdate, rootfsbuild = os.path.basename(rootfs_url).\
+                                         rsplit(".", 2)[0].rsplit("-", 2)
 
 deploy_params = { 'hwpack':hwpack_url, 'rootfs':rootfs_url }
 template['actions'][0]['parameters'] = deploy_params
@@ -64,7 +66,6 @@
 metadata['hwpack.type'] = hwpacktype
 metadata['hwpack.date'] = hwpackdate
 
-rootfsdate, rootfsbuild = rootfs_id.split('.')
 metadata['rootfs.type'] = imagetype
 metadata['rootfs.date'] = rootfsdate
 metadata['rootfs.build'] = rootfsbuild

=== modified file 'get_latest_slo_hwpack'
--- get_latest_slo_hwpack	2011-09-05 12:40:52 +0000
+++ get_latest_slo_hwpack	2012-05-17 13:12:17 +0000
@@ -8,5 +8,5 @@
 import os
 
 hwpacktype = os.getenv("hwpack_type", "unknown")
-hwpack_id, hwpack_url = find_latest_hwpack(hwpacktype)
+hwpack_url = find_latest_hwpack(hwpacktype)
 print hwpack_url