Merge lp:~sbaldassin/qakit/bileto_qakit into lp:qakit

[Santiago Baldassin]

Avoid the ust run if it was already triggered and return a default filter

This change prevents the ust run if it was already triggered and it also returns a default filter for those cases where the source package mapping was not added to the domains.json

Unmerged revisions

197. By Santiago Baldassin on 2016-10-04

Minor changes

=== modified file 'qakit/practitest/practitest.py'
--- qakit/practitest/practitest.py	2016-09-15 18:35:45 +0000
+++ qakit/practitest/practitest.py	2016-10-04 13:03:19 +0000
@@ -27,7 +27,7 @@
 from qakit.practitest import auth
 from qakit.practitest import util
 
-
+DEFAULT_FILTER_LIST = ["126288"]
 PROD_PRACTITEST = 'https://prod.practitest.com/api'
 
 TEST_LEVEL = '___f_10490'
@@ -399,7 +399,11 @@
         domains_file = os.path.join(practitest_dir, 'data', 'domains.json')
         with open(domains_file) as domains:
             domains_json = json.loads(domains.read())
-        filters = [domains_json[package] for package in src_pkgs]
+        try:
+            filters = [domains_json[package] for package in src_pkgs]
+        except KeyError:
+            return DEFAULT_FILTER_LIST
 
         # Flat the lists and remove duplicates
         return list(set([item for sublist in filters for item in sublist]))
+

=== modified file 'qakit/ust/worker.py'
--- qakit/ust/worker.py	2016-09-15 19:32:05 +0000
+++ qakit/ust/worker.py	2016-10-04 13:03:19 +0000
@@ -62,27 +62,28 @@
         is published in such a topic, it will be process by the
         process_ust_request method which will call this one to run the tests
         """
-        team, ppa_name = ppa.split('/')
-        launchpad_ppa = Ppa(team=team, name=ppa_name)
-        src_pkgs = launchpad_ppa.get_source_packages()
-        packages = list(
-            set([package.source_package_name for package in src_pkgs]))
-        request_id = launchpad_ppa.calculate_hash()
-
-        pt = PractitestSession(self.conf.parser.get('practitest', 'project_id'),
-                               self.conf.parser.get('practitest', 'api_key'),
-                               self.conf.parser.get('practitest', 'api_secret_key'))
-        filters = pt.get_filters_for_src_pkgs(packages)
-        tests = pt.get_tests(filters)
-
-        try:
-            tests_ids = ' '.join([test['___f_10589']['value'] for test in tests])
-        except KeyError:
-            tests_ids = ' '
-
-        self.jenkins.build_job(self.conf.parser.get('jenkins', 'job_name'),
-                               {"PPA": ppa, "TESTS_TO_RUN": tests_ids, "REQUEST_ID": request_id},
-                               {'token': self.conf.parser.get('jenkins', 'token')})
+        if self.get_result(ppa) is None:
+            team, ppa_name = ppa.split('/')
+            launchpad_ppa = Ppa(team=team, name=ppa_name)
+            src_pkgs = launchpad_ppa.get_source_packages()
+            packages = list(
+                set([package.source_package_name for package in src_pkgs]))
+            request_id = launchpad_ppa.calculate_hash()
+
+            pt = PractitestSession(self.conf.parser.get('practitest', 'project_id'),
+                                   self.conf.parser.get('practitest', 'api_key'),
+                                   self.conf.parser.get('practitest', 'api_secret_key'))
+            filters = pt.get_filters_for_src_pkgs(packages)
+            tests = pt.get_tests(filters)
+
+            try:
+                tests_ids = ' '.join([test['___f_10589']['value'] for test in tests])
+            except KeyError:
+                tests_ids = ' '
+
+            self.jenkins.build_job(self.conf.parser.get('jenkins', 'job_name'),
+                                   {"PPA": ppa, "TESTS_TO_RUN": tests_ids, "REQUEST_ID": request_id},
+                                   {'token': self.conf.parser.get('jenkins', 'token')})
 
     def get_result(self, ppa):
         """