From 83f1635e6b9e26f9da9c0fec8306690462f18e73 Mon Sep 17 00:00:00 2001 From: Martin Pitt Date: Tue, 9 Feb 2016 16:58:09 +0100 Subject: [PATCH] Don't use latest timestamp from results.cache if it is shared When using a shared results cache with PPAs (silos) we cannot rely on the latest time stamp from the distro's results.cache. As soon as there is a new run for a package in Ubuntu proper, that updated time stamp hides all previous results for the PPA, and causes tests to be re-requested unnecessarily. --- autopkgtest.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/autopkgtest.py b/autopkgtest.py index 8e3d8cd..a948791 100644 --- a/autopkgtest.py +++ b/autopkgtest.py @@ -324,9 +324,10 @@ class AutoPackageTest(object): 'prefix': '%s/%s/%s/%s/' % (self.series, arch, srchash(src), src)} # determine latest run_id from results - latest_run_id = self.latest_run_for_package(src, arch) - if latest_run_id: - query['marker'] = query['prefix'] + latest_run_id + if not self.britney.options.adt_shared_results_cache: + latest_run_id = self.latest_run_for_package(src, arch) + if latest_run_id: + query['marker'] = query['prefix'] + latest_run_id # request new results from swift url = os.path.join(swift_url, self.swift_container)