Merge lp:~canonical-platform-qa/snappy-ecosystem-tests/fix-snap-builder into lp:snappy-ecosystem-tests

[Omer Akram]

Fix snap builder

The snap builder is broken right now, this branch fixes it.

Note: the change is isolated so does not affect already existing tests/infrastructure.

[lp:~canonical-platform-qa/snappy-ecosystem-tests/fix-snap-builder]

43. By Omer Akram on 2017-03-16

Add default description and summary for snap to reduce required parameters

[Omer Akram (om26er)]

This is to be consumed by a snap upload test that is incoming in a bit. Just wanting to keep this change separate from the actual test. Also the reason to reduce the requirement for parameters while building a snap is "convenience".

[Omer Akram (om26er)]

test result here: http://paste.ubuntu.com/24188089/

[lp:~canonical-platform-qa/snappy-ecosystem-tests/fix-snap-builder]

44. By Omer Akram on 2017-03-16

increase container internet wait time

[I Ahmad (iahmad)]

LGTM - executed the tests on cloud instance and results can be found here

http://paste.ubuntu.com/24188179/

review: Approve

[platform-qa-bot (platform-qa-bot)]

review: Approve (continuous-integration)

=== modified file 'snappy_ecosystem_tests/environment/containers/lxd.py'
--- snappy_ecosystem_tests/environment/containers/lxd.py	2017-03-15 14:12:51 +0000
+++ snappy_ecosystem_tests/environment/containers/lxd.py	2017-03-16 11:29:36 +0000
@@ -164,7 +164,7 @@
                 'echo \'{}={}\' >> /etc/environment'.format(variable,
                                                             value))
 
-    def wait_for_internet(self, container, attempts_count=10,
+    def wait_for_internet(self, container, attempts_count=30,
                           attempt_interval=1, ping_domain=DOMAIN_PING):
         """Wait for internet connectivity in the container."""
         for _ in range(attempts_count):

=== modified file 'snappy_ecosystem_tests/helpers/snapcraft/build_snap.py'
--- snappy_ecosystem_tests/helpers/snapcraft/build_snap.py	2017-03-07 13:53:31 +0000
+++ snappy_ecosystem_tests/helpers/snapcraft/build_snap.py	2017-03-16 11:29:36 +0000
@@ -48,6 +48,10 @@
   {snap_name}:
     command: echo ok
 """
+SUMMARY_SNAP_DEFAULT = 'A test snap.'
+DESCRIPTION_SNAP_DEFAULT = 'A very awesome test snap.'
+GRADE_SNAP_DEFAULT = 'stable'
+CONFINEMENT_SNAP_DEFAULT = 'strict'
 
 
 class SnapBuilder:
@@ -63,6 +67,12 @@
          execution over ssh"""
         return SSHManager.get_instance(self.hostname, self.username, self.port)
 
+    def run_command_ssh(self, command, cwd=''):
+        """Run command over ssh with optional cwd."""
+        if cwd:
+            command = 'cd {}; {}'.format(cwd, command)
+        return self.ssh.exec_command(command)
+
     def is_host_setup(self):
         """Return bool representing whether the remote host is setup by
         checking if snapcraft package is installed."""
@@ -78,8 +88,9 @@
         for command in COMMANDS_SETUP:
             self.ssh.exec_command(command)
 
-    def build(self, name, version, summary, description, grade='stable',
-              confinement='strict'):
+    def build(self, name, version, summary=SUMMARY_SNAP_DEFAULT,
+              description=DESCRIPTION_SNAP_DEFAULT, grade=GRADE_SNAP_DEFAULT,
+              confinement=CONFINEMENT_SNAP_DEFAULT):
         """Build a new snap in the remote host and return its remote path.
 
         :param name: name of the snap to build.
@@ -95,8 +106,8 @@
         if not self.is_host_setup():
             self.setup_host()
         tempdir = self.ssh.exec_command('mktemp -d')
-        self.ssh.exec_command('mkdir snap', cwd=tempdir)
-        self.ssh.exec_command('echo "{}" > snap/snapcraft.yaml'.format(
+        self.run_command_ssh('mkdir snap', cwd=tempdir)
+        self.run_command_ssh('echo "{}" > snap/snapcraft.yaml'.format(
             SNAPCRAFT_YAML.format(
                 snap_name=name,
                 version=version,
@@ -106,7 +117,7 @@
                 confinement=confinement
             )
         ), cwd=tempdir)
-        self.ssh.exec_command('snapcraft', cwd=tempdir)
+        self.run_command_ssh('snapcraft', cwd=tempdir)
         return os.path.join(
             tempdir,
             '{name}_{version}_{arch}.snap'.format(
@@ -116,8 +127,10 @@
             )
         )
 
-    def build_and_pull(self, name, version, summary, description,
-                       grade='stable', confinement='strict',
+    def build_and_pull(self, name, version, summary=SUMMARY_SNAP_DEFAULT,
+                       description=DESCRIPTION_SNAP_DEFAULT,
+                       grade=GRADE_SNAP_DEFAULT,
+                       confinement=CONFINEMENT_SNAP_DEFAULT,
                        output_location='.'):
         """Build a snap based on the provided arguments and download it.