Merge lp:~psivaa/auto-package-testing/cache-update-for-sru into lp:~canonical-ci-engineering/auto-package-testing/enabling-sru-testing

[Para Siva]

Porting the cache update fix that we did in boottesting

Porting the cache update fix that we did in boottesting. This will be needed if boottesting branch does not land before this. (The fix was to commit the local changes in d-jenkins so that the cache gets properly updated every 10 mins)

[Vincent Ladeuil (vila)]

Good catch !

review: Approve

[Francis Ginther (fginther)]

This matches the hotfix that is in place on d-jenkins.ubuntu-ci:/var/lib/jenkins/QA/auto-package-testing/jenkins/aptcache.py

review: Approve

=== modified file 'jenkins/aptcache.py'
--- jenkins/aptcache.py	2014-04-17 09:56:58 +0000
+++ jenkins/aptcache.py	2015-02-19 14:37:58 +0000
@@ -54,12 +54,12 @@
         self.proposed = False
 
         self.timestampfile = os.path.normpath(
-            os.path.join(rootdir, 'var/cache/apt/pkgcache.bin'))
+            os.path.join(rootdir, 'var/cache/apt/cache.timestamp'))
 
         super(AptCache, self).__init__(rootdir=rootdir, memonly=False)
         self.rootdir = rootdir
 
-    def update(self, cache_age=60, force_update=False):
+    def update(self, cache_age=10, force_update=False):
         ''' Equivalent of apt-get update
 
         :param cache_age: Update the cache when it is older than
@@ -78,6 +78,7 @@
             not os.path.exists(self.timestampfile)) or (
                 (currtime - timestamp) > cache_age * 60):
             logging.debug('Updating cache')
+            open(self.timestampfile, 'w').close()
             super(AptCache, self).update()
             super(AptCache, self).open()
         else: