Merge lp:~brendan-donegan/phablet-tools/phablet_click_test_setup_ppa into lp:phablet-tools

[Brendan Donegan]

Add --silo option to phablet-click-test-setup

Add a --silo option so that phablet-click-test-setup can work when one of the packages it needs to get the source for is in a silo and not in the archive - usually happens in the case of UITK or unity 8 landings. I need feedback on:

1.) Should it work with PPAs in general instead of just silos?
2.) Should it look in the silo first and then the archive for the package - is this important?

[lp:~brendan-donegan/phablet-tools/phablet_click_test_setup_ppa]

309. By Brendan Donegan on 2014-09-17

flake8 fix

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:309
No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want a jenkins rebuild you need to trigger it yourself):
https://code.launchpad.net/~brendan-donegan/phablet-tools/phablet_click_test_setup_ppa/+merge/235007/+edit-commit-message

http://jenkins.qa.ubuntu.com/job/phablet-tools-ci/389/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/phablet-tools-utopic-amd64-ci/70
    SUCCESS: http://jenkins.qa.ubuntu.com/job/phablet-tools-utopic-armhf-ci/70
    SUCCESS: http://jenkins.qa.ubuntu.com/job/phablet-tools-utopic-i386-ci/70

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/phablet-tools-ci/389/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:309
http://jenkins.qa.ubuntu.com/job/phablet-tools-ci/390/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/phablet-tools-utopic-amd64-ci/71
    SUCCESS: http://jenkins.qa.ubuntu.com/job/phablet-tools-utopic-armhf-ci/71
    SUCCESS: http://jenkins.qa.ubuntu.com/job/phablet-tools-utopic-i386-ci/71

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/phablet-tools-ci/390/rebuild

review: Approve (continuous-integration)

Unmerged revisions

309. By Brendan Donegan on 2014-09-17

flake8 fix

308. By Brendan Donegan on 2014-09-17

Add --silo option so p-c-t-s can work when a silo is installed

=== modified file 'phablet-click-test-setup'
--- phablet-click-test-setup	2014-09-05 21:02:02 +0000
+++ phablet-click-test-setup	2014-09-17 15:56:09 +0000
@@ -45,7 +45,11 @@
     def series(self):
         return self._series
 
-    def __init__(self, distribution, release, arch):
+    @property
+    def silo(self):
+        return self._silo
+
+    def __init__(self, distribution, release, arch, silo):
         self.lp = Launchpad.login_anonymously('phablet-click-test-setup',
                                               'production',
                                               '~/.launchpadlib/cache',
@@ -54,6 +58,11 @@
         self._series = distro.getSeries(name_or_version=release)
         self._arch_series = self._series.getDistroArchSeries(archtag=arch)
         self._archive = self.lp.distributions[distribution].main_archive
+        if silo:
+            self._silo = self.lp.people['ci-train-ppa-service'].getPPAByName(
+                distribution=distro,
+                name=silo
+            )
 
 
 lp = None
@@ -114,6 +123,8 @@
                         help='Selects distribution to use')
     parser.add_argument('--series', default=None,
                         help='Selects series to use')
+    parser.add_argument('--silo', default=None,
+                        help='Specify a Silo to use')
     return parser.parse_args()
 
 
@@ -179,6 +190,14 @@
         status="Published", pocket='Release',
         exact_match=True)
     # TODO needs filtering
+    if len(sp) == 0:
+        # Look in the PPA instead
+        sp = lp.silo.getPublishedSources(
+            source_name=package,
+            version=version,
+            distro_series=lp.series,
+            status="Published", pocket='Release',
+            exact_match=True)
     source_url = sp[0].sourceFileUrls()[0]
     print('Downloading %s version %s from %s' % (package, version, source_url))
     url = urllib2.urlopen(source_url)
@@ -257,7 +276,7 @@
     arch = adb.shell('sudo -iu phablet dpkg --print-architecture').strip()
     if not args.series:
         args.series = adb.shell('lsb_release -c -s').strip()
-    lp = LP(args.distribution, args.series, arch)
+    lp = LP(args.distribution, args.series, arch, args.silo)
     test_dir = tempfile.mkdtemp()
     os.mkdir(os.path.join(test_dir, py2_subdir))
     atexit.register(cleanup, test_dir)