Merge lp:~sinzui/juju-ci-tools/match-job-name into lp:juju-ci-tools

[Curtis Hovey]

Match the exact job name.

the assemble-stream job fails because s3ci.py assumes it got an exact match of the job name. Yesterday I added 1-8 counterpart jobs for all the build agent jobs. s3ci.py is confused by build-centos and build-centos-1-8. It looks for "/build-" to follow the exact jobs name. It errors when it does not find a build number in "-1-8/build" because
the fragment does not start with "/build-"

My fix just checks for a match, No match means the job name is not an exact match. We had a good test; adding the case reproduced the problem. I added logging to see that s3ci/py found.

[Christopher Lee (veebers)]

LGTM

review: Approve

=== modified file 's3ci.py'
--- s3ci.py	2017-02-22 16:08:27 +0000
+++ s3ci.py	2017-04-07 00:02:58 +0000
@@ -120,7 +120,11 @@
     keys = bucket.list(prefix)
     by_build = {}
     for key in keys:
+        logging.debug('looking at {}'.format(key.name))
         match = re.search('^/build-(\d+)', key.name[len(prefix):])
+        if match is None:
+            logging.debug('job name is not /{}/'.format(job))
+            continue
         build = int(match.group(1))
         by_build.setdefault(build, []).append(key)
     # We can't use last successful build, because we don't know what builds

=== modified file 'tests/test_s3ci.py'
--- tests/test_s3ci.py	2017-02-22 16:08:27 +0000
+++ tests/test_s3ci.py	2017-04-07 00:02:58 +0000
@@ -283,8 +283,9 @@
         match_key = FakeKey(275, 'job-foo', 27, 'file-pattern')
         wrong_name = FakeKey(275, 'job-foo', 27, 'file-pat+ern')
         wrong_job = FakeKey(275, 'job.foo', 27, 'file-pattern')
+        wrong_job2 = FakeKey(275, 'job-foo-1-8', 27, 'file-pattern')
         wrong_rb = FakeKey(276, 'job-foo', 27, 'file-pattern')
-        keys = [match_key, wrong_name, wrong_job, wrong_rb]
+        keys = [match_key, wrong_name, wrong_job, wrong_rb, wrong_job2]
         bucket = FakeBucket(keys)
         filtered = find_file_keys(
             bucket, 275, 'job-foo', 'file-pat+ern')