autopkgtest: call filter_old_results after adding triggers to avoid code duplication

britney2/policies/autopkgtest.py

@@ -171,14 +171,6 @@ class AutopkgtestPolicy(BasePolicy):
                 test_results = json.load(f)
                 self.test_results = self.check_and_upgrade_cache(test_results)
             self.logger.info('Read previous results from %s', self.results_cache_file)
-
-            # The cache can contain results against versions of packages that
-            # are not in any suite anymore. Strip those out, as we don't want
-            # to use those results. Additionally, old references may be
-            # filtered out.
-            if self.options.adt_baseline == 'reference':
-                self.filter_old_results()
-
         else:
             self.logger.info('%s does not exist, re-downloading all results from swift', self.results_cache_file)
 
@@ -227,6 +219,13 @@ class AutopkgtestPolicy(BasePolicy):
             else:
                 self.logger.info('%s does not exist, no new data will be processed', debci_file)
 
+        # The cache can contain results against versions of packages that
+        # are not in any suite anymore. Strip those out, as we don't want
+        # to use those results. Additionally, old references may be
+        # filtered out.
+        if self.options.adt_baseline == 'reference':
+            self.filter_old_results()
+
         # we need sources, binaries, and installability tester, so for now
         # remember the whole britney object
         self.britney = britney
@@ -883,17 +882,6 @@ class AutopkgtestPolicy(BasePolicy):
         if trigsrc == src and apt_pkg.version_compare(ver, trigver) < 0:
             self.logger.debug('test trigger %s, but run for older version %s, ignoring', trigger, ver)
             return
-        if self.options.adt_baseline == 'reference' and \
-           not self.test_version_in_any_suite(src, ver):
-            self.logger.debug(
-                "Ignoring result for source %s and trigger %s as the tested version %s isn't found in any suite",
-                src, trigger, ver)
-            return
-        if trigger == REF_TRIG and \
-           seen < self._now - self.options.adt_reference_max_age:
-            self.logger.debug(
-                "Ignoring reference result for source %s as it's too old", src)
-            return
 
         result = self.test_results.setdefault(trigger, {}).setdefault(
             src, {}).setdefault(arch, [Result.FAIL, None, '', 0])