Merge lp:~robru/qakit/bileto-cleanup into lp:qakit

[Robert Bruce Park]

Some minor cleanups in the card bot and UST.

[Santiago Baldassin (sbaldassin)]

Code looks good to me. If changes in Bileto are already in place, we can land this one

review: Approve

[Robert Bruce Park (robru)]

Yep, it's all ready to go!

[Santiago Baldassin (sbaldassin)]

Great Robert, we don't have automerge in qakit so you'll need to push your change to lp:qakit

[Max Brustkern (nuclearbob)]

Would you like to setup autolanding for qakit? We can add that to lp:qa-jenkins-jobs pretty easily.

=== modified file 'qakit/ust/worker.py'
--- qakit/ust/worker.py	2016-10-18 08:40:00 +0000
+++ qakit/ust/worker.py	2016-10-26 00:50:35 +0000
@@ -25,16 +25,13 @@
 
 
 class Worker:
-
-    bileto_results = {"PASSED": "Approved", "FAILURE": "Failed", "QUEUED": "Queued"}
-
     def __init__(self):
         self.conf = Config()
         self.jenkins = Jenkins(self.conf.parser.get('jenkins', 'server'),
                                self.conf.parser.get('jenkins', 'username'),
                                self.conf.parser.get('jenkins', 'password'))
 
-    def run_ust(self, ppa):
+    def run_ust(self, team, ppa):
         """"
         This method will execute the following steps:
         1. Get the source packages from launchpad that are
@@ -50,20 +47,18 @@
             c. Setup the device for testing
             d. Run the tests
 
-        :param ppa is the ppa associated to the request in bileto and it is
-        expected to be in the format team/ppa_name.
-        For example: ci-train-ppa-service/landing-059
+        :param team is the launchpad team that owns the ppa
+        :param ppa is the name of the launchpad ppa to test
 
         This method has two entry points, it can be called by importing the
         qakit module and creating a Worker instance like this
-            Worker().run_ust("ci-train-ppa-service/landing-059")
+            Worker().run_ust("ci-train-ppa-service", "1234.1")
         And there's also an amqp entry point. The start method will start an amqp
         client which will be subscribed to /ubuntu-system-test, whenever a message
         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)
+        launchpad_ppa = Ppa(team=team, name=ppa)
         src_pkgs = launchpad_ppa.get_source_packages()
         packages = list(
             set([package.source_package_name for package in src_pkgs]))
@@ -81,10 +76,10 @@
             tests_ids = ' '
 
         self.jenkins.build_job(self.conf.parser.get('jenkins', 'job_name'),
-                               {"PPA": ppa, "TESTS_TO_RUN": tests_ids, "REQUEST_ID": request_id},
+                               {"PPA": '{}/{}'.format(team, ppa), "TESTS_TO_RUN": tests_ids, "REQUEST_ID": request_id},
                                {'token': self.conf.parser.get('jenkins', 'token')})
 
-    def get_result(self, ppa):
+    def get_result(self, team, ppa):
         """
         The tests results are retrieved from jenkins and the ppa is used to get the
         appropriate tests results. As when the tests were triggered, the list of
@@ -98,8 +93,7 @@
         If the correct build is not found in the get_job_info results, then we'll check the
         get_queue_info and if the build is not found there, then an error is returned
         """
-        team, ppa_name = ppa.split('/')
-        launchpad_ppa = Ppa(team=team, name=ppa_name)
+        launchpad_ppa = Ppa(team=team, name=ppa)
         request_id = launchpad_ppa.calculate_hash()
 
         builds = self.jenkins.get_job_info(
@@ -168,7 +162,7 @@
         logging.info('Message received {}'.format(body))
 
         ppa = json.loads(body.decode('utf-8'))['ppa']
-        self.run_ust(ppa)
+        self.run_ust(*ppa.split('/'))
 
 
 class UstResult:

=== modified file 'silo-card-bot/silo_notifier'
--- silo-card-bot/silo_notifier	2016-09-26 10:13:00 +0000
+++ silo-card-bot/silo_notifier	2016-10-26 00:50:35 +0000
@@ -161,7 +161,7 @@
         logging.debug('Writing status to %s', path)
         status = {}
         for row in data:
-            status[row['request_id']] = row['qa_signoff']
+            status[row['id']] = row['qa_signoff']
         with open(path, 'w+') as status_file:
             json.dump(status, status_file)
     except:
@@ -182,7 +182,7 @@
     done = set()
 
     for row in rows:
-        request_id = unicode(row['request_id'])
+        request_id = unicode(row['id'])
         old_status = testing_status.get(request_id, '')
         new_status = row['qa_signoff']
         if request_id in done:
@@ -279,8 +279,8 @@
             ### Merge Proposals
             {}
             ''').format(
-                request['request_id'],
-                BILETO_URL + '#/ticket/{}'.format(request['request_id']),
+                request['id'],
+                BILETO_URL + '#/ticket/{}'.format(request['id']),
                 silo_utils.linkify_bugs(request['description']),
                 request['test_plan'],
                 mps
@@ -311,7 +311,6 @@
     if READY not in request['qa_signoff']:
         return False
 
-    silo_name = request['siloname']
     landers = ", ".join(request['landers'].split())
     # additional_packages = request[COL.additional_source_packages_to_land]
     additional_packages = ""
@@ -331,8 +330,8 @@
             projectnames = request['sources'].split()
 
         message = "[{}] {} - {} : {}".format(
-            request['request_id'],
-            silo_name,
+            request['id'],
+            request['ppa'],
             ", ".join(projectnames),
             landers)
         description = get_description(request, mps)
@@ -464,7 +463,7 @@
 
 def remove_not_ready_for_qa(api_key, token, landing_data, dry_run=False):
     """ Move to failed the cards that are not ready for QA anymore """
-    reqs_ready = [req['request_id'] for req in landing_data
+    reqs_ready = [req['id'] for req in landing_data
                   if READY in req['qa_signoff']]
 
     for request in get_cards_ready_for_qa(api_key, token):