Merge lp:~psivaa/auto-package-testing/rc-file-and-debug-log into lp:~canonical-ci-engineering/auto-package-testing/add-boottest-requests

[Para Siva]

Adding the rc file specific to CI deployment in tachash. and logging improvement

This is still work in progress, but proposing just to make sure all of us and tachash are on the same page. The rc file is needed with the right information specific to tachash as /var/lib/jenkins/CI/boottest-britney.rc.

[lp:~psivaa/auto-package-testing/rc-file-and-debug-log]

399. By Para Siva on 2015-02-10

Fixing the cache updating issue, looking at the right timestamp file and making it sure we open it to update the timestamp

[Vincent Ladeuil (vila)]

Well done !

review: Approve

[lp:~psivaa/auto-package-testing/rc-file-and-debug-log]

400. By Para Siva on 2015-02-10

Removing defuct entry in rc file

[Vincent Ladeuil (vila)]

Thanks, sorry for mentioning that issue with the dead entry on irc instead of here.

review: Approve

=== added file 'etc/boottest-britney.rc'
--- etc/boottest-britney.rc	1970-01-01 00:00:00 +0000
+++ etc/boottest-britney.rc	2015-02-10 11:07:00 +0000
@@ -0,0 +1,7 @@
+# Default configuration file for adt-britney
+# This file should be placed under
+# /var/lib/jenkins/CI/
+aptroot: /var/lib/jenkins/CI/boottest/aptroot
+apturi: http://ftpmaster.internal/ubuntu/
+components: main restricted universe multiverse
+datadir: /var/local/boottest/

=== modified file 'jenkins/aptcache.py'
--- jenkins/aptcache.py	2014-04-17 09:56:58 +0000
+++ jenkins/aptcache.py	2015-02-10 11:07:00 +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:

=== modified file 'jenkins/run-boottest-jenkins.py'
--- jenkins/run-boottest-jenkins.py	2015-01-29 22:15:22 +0000
+++ jenkins/run-boottest-jenkins.py	2015-02-10 11:07:00 +0000
@@ -174,6 +174,7 @@
                                                                   out,
                                                                   err))
                 log.error(msg)
+            log.info(err)
 
         copy_results(log, release)
         log.info("===== Done =====")