Merge lp:~abentley/juju-release-tools/no-debs-error into lp:juju-release-tools

[Aaron Bentley]

Error when no debs are found.

This branch updates generate_agents to error when no debs are found.

In circumstances where the package isn't available as expected (e.g. wrong upatch), the release-juju-update-unsigned job does error, but does so quite late in the process, and not intentionally.
http://juju-ci.vapour.ws:8080/job/release-juju-update-unsigned/30/console

This branch updates generate_agents to fail immediately if it was unable to download any debs.

[Curtis Hovey (sinzui)]

Thank you.

review: Approve (code)

=== modified file 'generate_agents.py'
--- generate_agents.py	2016-03-02 17:58:51 +0000
+++ generate_agents.py	2016-03-28 16:45:58 +0000
@@ -27,12 +27,32 @@
 from utils import temp_dir
 
 
+class NoDebsFound(Exception):
+    """Raised when no .deb files could be found."""
+
+
 # These are the archives that are searched for matching releases.
 UBUNTU_ARCH = "http://archive.ubuntu.com/ubuntu/pool/universe/j/juju-core/"
 ARM_ARCH = "http://ports.ubuntu.com/pool/universe/j/juju-core/"
 PUBLIC_ARCHIVES = [UBUNTU_ARCH, ARM_ARCH]
 
 
+def move_debs(dest_debs):
+    juju_core_dir = os.path.join(dest_debs, 'juju2')
+    if not os.path.isdir(juju_core_dir):
+        # The juju2 package was not found, try the juju-core package.
+        juju_core_dir = os.path.join(dest_debs, 'juju-core')
+    if os.path.isdir(juju_core_dir):
+        debs = glob.glob(os.path.join(juju_core_dir, '*deb'))
+    else:
+        debs = []
+    if len(debs) == 0:
+        raise NoDebsFound('No deb files found.')
+    for deb in debs:
+        shutil.move(deb, dest_debs)
+    shutil.rmtree(juju_core_dir)
+
+
 def retrieve_packages(release, upatch, archives, dest_debs, s3_config):
     # Retrieve the packages that contain a jujud for this version.
     print("Retrieving juju-core packages from archives")
@@ -47,15 +67,7 @@
             'lftp', '-c', 'mirror', '-i',
             "(juju2|juju-core).*{}.*\.{}~juj.*\.deb".format(release, upatch),
             archive], cwd=dest_debs)
-    juju_core_dir = os.path.join(dest_debs, 'juju2')
-    if not os.path.isdir(juju_core_dir):
-        # The juju2 package was not found, try the juju-core package.
-        juju_core_dir = os.path.join(dest_debs, 'juju-core')
-    if os.path.isdir(juju_core_dir):
-        debs = glob.glob(os.path.join(juju_core_dir, '*deb'))
-        for deb in debs:
-            shutil.move(deb, dest_debs)
-        shutil.rmtree(juju_core_dir)
+    move_debs(dest_debs)
     if os.path.exists(s3_config):
         print(
             'checking s3://juju-qa-data/agent-archive for'

=== added file 'tests/test_generate_agents.py'
--- tests/test_generate_agents.py	1970-01-01 00:00:00 +0000
+++ tests/test_generate_agents.py	2016-03-28 16:45:58 +0000
@@ -0,0 +1,42 @@
+import os
+from unittest import TestCase
+
+from generate_agents import (
+    move_debs,
+    NoDebsFound,
+    )
+from utils import temp_dir
+
+
+class TestMoveDebs(TestCase):
+
+    def test_juju2(self):
+        with temp_dir() as dest_debs:
+            parent = os.path.join(dest_debs, 'juju2')
+            os.mkdir(parent)
+            open(os.path.join(parent, 'foo.deb'), 'w').close()
+            move_debs(dest_debs)
+            self.assertTrue(os.path.exists(os.path.join(dest_debs, 'foo.deb')))
+
+    def test_juju_core(self):
+        with temp_dir() as dest_debs:
+            parent = os.path.join(dest_debs, 'juju-core')
+            os.mkdir(parent)
+            open(os.path.join(parent, 'foo.deb'), 'w').close()
+            move_debs(dest_debs)
+            self.assertTrue(os.path.exists(os.path.join(dest_debs, 'foo.deb')))
+
+    def test_none(self):
+        with temp_dir() as dest_debs:
+            parent = os.path.join(dest_debs, 'juju-core')
+            os.mkdir(parent)
+            with self.assertRaisesRegexp(NoDebsFound, 'No deb files found.'):
+                move_debs(dest_debs)
+
+    def test_wrong_dir(self):
+        with temp_dir() as dest_debs:
+            parent = os.path.join(dest_debs, 'wrong-dir')
+            os.mkdir(parent)
+            open(os.path.join(parent, 'foo.deb'), 'w').close()
+            with self.assertRaisesRegexp(NoDebsFound, 'No deb files found.'):
+                move_debs(dest_debs)