Merge lp:~canonical-platform-qa/ubuntu-system-tests/qemu-build-snap into lp:ubuntu-system-tests

[Richard Huddie]

WIP

Unmerged revisions

502. By Richard Huddie on 2016-12-21

Minor fix.

501. By Richard Huddie on 2016-12-21

Fix flake8.

500. By Richard Huddie on 2016-12-21

Merge from trunk.

499. By Richard Huddie on 2016-12-21

Docstring updates.

498. By Richard Huddie on 2016-12-21

Fix existing self tests.

497. By Richard Huddie on 2016-12-21

Add a json config file to use with qemu-setup which controls whether to install unity8 as snap.

496. By Richard Huddie on 2016-12-21

Add snap option and create qemu-setup-config.json.

=== modified file 'ubuntu_system_tests/common/config.py'
=== modified file 'ubuntu_system_tests/host/command_line.py'
--- ubuntu_system_tests/host/command_line.py	2017-02-24 14:02:45 +0000
+++ ubuntu_system_tests/host/command_line.py	2017-03-06 13:53:57 +0000
@@ -113,6 +113,7 @@
 OPTION_QEMU_ISO_PATH = Option(
     ['--iso', '-i'],
     {'help': 'Path to local iso file to install into QEMU image.'})
+<<<<<<< TREE
 OPTION_QEMU_NO_OVERLAY = Option(
     ['--no-overlay', '-o'],
     {'action': 'store_true',
@@ -122,6 +123,14 @@
              'be launched with a temporary overlay image to prevent any '
              'persistent changes being made to the base image.',
      'default': False})
+=======
+OPTION_QEMU_SNAP = Option(
+    ['--snap'],
+    {'action': 'store_true',
+     'help': 'Install unity8 session as snap into QEMU image and use as '
+     'default user session.',
+     'default': False})
+>>>>>>> MERGE-SOURCE
 OPTION_LIST_SUITES = Option(
     ['suites'],
     {'nargs': '*',
@@ -208,6 +217,7 @@
     OPTION_QEMU_IMG_PATH,
     OPTION_QEMU_ISO_PATH,
     OPTION_QEMU_HEADLESS,
+    OPTION_QEMU_SNAP,
     OPTION_VERBOSE,
 ]
 
@@ -406,8 +416,13 @@
         iso_path = qemu_utils.download_iso(iso, arch, data_folder, max_count)
 
     qemu.build_qemu(
+<<<<<<< TREE
         img_path, iso_path, cpu, ram, img_disk_size, headless, args.verbose,
         username, password, display_name)
+=======
+        img_path, iso_path, cpu, ram, img_disk_size, AUTOPKGTEST_USER,
+        AUTOPKGTEST_PASS, AUTOPKGTEST_NAME, headless, args.verbose, args.snap)
+>>>>>>> MERGE-SOURCE
     # Cleanup the iso cache folder. Leave image file in place as this will
     # be used for further testing.
     qemu_utils.clean_iso_cache_folder(data_folder, max_count)

=== modified file 'ubuntu_system_tests/host/preseed.cfg'
--- ubuntu_system_tests/host/preseed.cfg	2016-11-08 09:56:06 +0000
+++ ubuntu_system_tests/host/preseed.cfg	2017-03-06 13:53:57 +0000
@@ -57,6 +57,9 @@
 ubiquity ubiquity/success_command string \
 cp qemu-setup.py /target/usr/local/bin/qemu-setup.py; \
 chmod 755 /target/usr/local/bin/qemu-setup.py; \
+mkdir -p /target/usr/local/share/ubuntu-system-tests; \
+cp qemu-setup-config.json /target/usr/local/share/ubuntu-system-tests/qemu-setup-config.json; \
+chmod 744 /target/usr/local/share/ubuntu-system-tests/qemu-setup-config.json; \
 cp qemu-setup.service /target/lib/systemd/system/qemu-setup.service; \
 chmod 644 /target/lib/systemd/system/qemu-setup.service; \
 chroot /target /bin/systemctl enable qemu-setup.service; \

=== modified file 'ubuntu_system_tests/host/qemu-scripts/qemu-setup.py'
--- ubuntu_system_tests/host/qemu-scripts/qemu-setup.py	2017-01-03 11:39:29 +0000
+++ ubuntu_system_tests/host/qemu-scripts/qemu-setup.py	2017-03-06 13:53:57 +0000
@@ -18,8 +18,14 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 
+<<<<<<< TREE
+=======
+import dbus
+import json
+>>>>>>> MERGE-SOURCE
 import os
 import subprocess
+import sys
 import time
 
 AUTOPKGTEST_NAME = 'autopkgtest.service'
@@ -88,15 +94,41 @@
     subprocess.check_call(['apt-get', 'install', '-y'] + packages)
 
 
+<<<<<<< TREE
+=======
+def install_unity8_snap():
+    """Run unity8-snap-install to install unity8 and application snaps."""
+    subprocess.check_call(['unity8-snap-install'])
+
+
+def upgrade_system():
+    """Perform dist-upgrade on system."""
+    wait_for_locks()
+    # Add a timeout in case dist-upgrade hangs. This can happen when
+    # updating snapd during boot process: https://launchpad.net/bugs/1621336
+    subprocess.check_call(['apt-get', '-y', 'dist-upgrade'], timeout=600)
+    wait_for_locks()
+
+
+>>>>>>> MERGE-SOURCE
 def create_file(path, content):
     """Create a file with specified path and content."""
     with open(path, 'w') as f:
         f.write(content)
 
 
+<<<<<<< TREE
 def setup_root_shell_service():
     """Setup root shell service on ttyS1 for use by autopkgtest."""
+=======
+def set_unity8_default_session(snap):
+    """Set unity8 to be the default session for user login.
+    :param snap: Whether to use unity8 snap session or default unity8 session.
+    """
+    session = 'unity8-snap' if snap else 'unity8'
+>>>>>>> MERGE-SOURCE
     create_file(
+<<<<<<< TREE
         AUTOPKGTEST_SERVICE,
         '[Unit]\n'
         'Description=autopkgtest root shell on ttyS1\n'
@@ -111,6 +143,11 @@
         'SuccessExitStatus=0 208 SIGHUP SIGINT SIGTERM SIGPIPE\n\n'
         '[Install]\n'
         'WantedBy=multi-user.target\n'
+=======
+        '/etc/lightdm/lightdm.conf',
+        '[Seat:*]\n'
+        'user-session={}\n'.format(session)
+>>>>>>> MERGE-SOURCE
     )
     os.chmod(AUTOPKGTEST_SERVICE, 0o644)
     subprocess.check_call(['systemctl', 'enable', AUTOPKGTEST_NAME])
@@ -197,11 +234,27 @@
     subprocess.call(['shutdown', '--poweroff', '0'])
 
 
-def do_setup():
-    """Complete first boot setup actions."""
+def do_setup(config):
+    """Complete first boot setup actions.
+    :param config: Setup config dictionary.
+    """
     wait_for_network()
     setup_serial_console()
+<<<<<<< TREE
     install_packages(['openssh-server'])
+=======
+    add_overlay_ppa()
+    snap = config.get('snap', False)
+    install_pkgs = ['openssh-server']
+    if snap:
+        install_packages(install_pkgs + ['unity8-session-snap'])
+        install_unity8_snap()
+    else:
+        install_packages(install_pkgs + ['unity8-desktop-session'])
+    upgrade_system()
+    set_unity8_default_session(snap)
+    set_auto_login()
+>>>>>>> MERGE-SOURCE
 
 
 def do_teardown():
@@ -210,9 +263,13 @@
     system_shutdown()
 
 
-def main():
+def main(argv=None):
+    args = argv or sys.argv[1:]
+    config_path = args[0]
+    with open(config_path, 'r') as f:
+        config = json.loads(f.read())
     try:
-        do_setup()
+        do_setup(config)
     finally:
         do_teardown()
 

=== modified file 'ubuntu_system_tests/host/qemu-scripts/qemu-setup.service'
--- ubuntu_system_tests/host/qemu-scripts/qemu-setup.service	2016-11-03 12:25:57 +0000
+++ ubuntu_system_tests/host/qemu-scripts/qemu-setup.service	2017-03-06 13:53:57 +0000
@@ -3,7 +3,7 @@
 
 [Service]
 Type=oneshot
-ExecStart=/bin/sh -c "/usr/bin/python3 /usr/local/bin/qemu-setup.py > /dev/ttyS0 2>&1"
+ExecStart=/bin/sh -c "/usr/bin/python3 /usr/local/bin/qemu-setup.py /usr/local/share/ubuntu-system-tests/qemu-setup-config.json > /dev/ttyS0 2>&1"
 
 [Install]
 WantedBy=multi-user.target

=== modified file 'ubuntu_system_tests/host/qemu.py'
--- ubuntu_system_tests/host/qemu.py	2017-02-20 19:49:08 +0000
+++ ubuntu_system_tests/host/qemu.py	2017-03-06 13:53:57 +0000
@@ -19,6 +19,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 
+import json
 import os
 import shlex
 import shutil
@@ -170,8 +171,13 @@
     subprocess.check_call(['wait', pid], shell=True)
 
 
+<<<<<<< TREE
 def build_qemu(img_path, iso_path, cpu, ram, img_disk_size, headless, verbose,
                username, password, display_name):
+=======
+def build_qemu(img_path, iso_path, cpu, ram, img_disk_size, username, password,
+               display_name, headless, verbose, snap):
+>>>>>>> MERGE-SOURCE
     """
     Build a qemu image file using specified ISO file as installer.
     :param img_path: Path of img file to use.
@@ -180,15 +186,20 @@
     :param ram: Amount of ram to allocate to qemu process.
     :param img_disk_size: Maximum size of disk for img file.
     :param headless: Whether to show installer UI during installation process.
+<<<<<<< TREE
     :param username: Username to setup during installation.
     :param password: Password of user account.
     :param display_name: Display name of user account.
+=======
+    :param snap: Whether to install unity8 session as snap.
+>>>>>>> MERGE-SOURCE
     """
     create_disk_image(img_path, img_disk_size)
     with TempDir() as working_dir:
         kernel = get_kernel(iso_path)
         extract_kernel(iso_path, kernel, working_dir.path)
-        prepare_initrd(working_dir.path, username, password, display_name)
+        prepare_initrd(
+            working_dir.path, username, password, display_name, snap)
         # launch qemu with installer options to start install process
         launch_qemu_with_image_cleanup(
             working_dir.path, img_path, ram, cpu, headless, SERIAL_LOG,
@@ -300,7 +311,18 @@
         os.chmod(dst, mask)
 
 
-def prepare_initrd(working_dir, username, password, display_name):
+def create_setup_config(initrd_work_dir, snap):
+    """Create json file containing setup configuration in initrd work dir.
+    :param initrd_work_dir: Working dir to save the json file.
+    :param snap: Whether snap or default session should be used.
+    """
+    config_file = os.path.join(initrd_work_dir, 'qemu-setup-config.json')
+    config = {'snap': snap}
+    with open(config_file, 'w') as f:
+        f.write(json.dumps(config))
+
+
+def prepare_initrd(working_dir, username, password, display_name, snap):
     """
     Prepare the initial ram disk. This is used to add all required custom test
     actions to the installation process and adds the preseed file to the root
@@ -310,6 +332,7 @@
     :param password: Password of user account.
     :param display_name: Display name of user account.
     :param auto_login: Whether to enable auto login for user.
+    :param snap: Whether snap or default session should be used.
     :return: Path of initrd file with installer scripts added.
     """
     initrd_path = os.path.join(working_dir, CASPER_INITRD)
@@ -323,6 +346,8 @@
     ps.wait()
     # copy the qemu scripts into initrd
     copy_qemu_scripts_to_path(initrd_work_dir)
+    # create the setup config file
+    create_setup_config(initrd_work_dir, snap)
     casper_prov = os.path.join(initrd_work_dir, 'qemu-casper-provision')
     add_script_to_casper_setup(initrd_work_dir, casper_prov)
     # create the preseed file

=== modified file 'ubuntu_system_tests/selftests/test_qemu.py'
--- ubuntu_system_tests/selftests/test_qemu.py	2017-02-20 19:49:08 +0000
+++ ubuntu_system_tests/selftests/test_qemu.py	2017-03-06 13:53:57 +0000
@@ -153,7 +153,7 @@
             mock_check_call, mock_popen, mock_chdir, mock_mkdir):
         with patch('builtins.open', mock_open()) as o:
             initrd_path = qemu.prepare_initrd(
-                '/tmp/work_dir', 'user1', 'pass1', 'disp1')
+                '/tmp/work_dir', 'user1', 'pass1', 'disp1', False)
             self.assertEqual(
                 '/tmp/work_dir/{}'.format(qemu.CASPER_INITRD), initrd_path)
             expected_check_calls = [
@@ -247,14 +247,19 @@
             mock_prepare_initrd, mock_extract_kernel, mock_get_kernel,
             mock_create_disk_image):
         qemu.build_qemu(
+<<<<<<< TREE
             '/tmp/disk.img', '/tmp/disk.iso', 3, 4096, '8G', False, False,
             'user1', 'pass1', 'User 1')
+=======
+            '/tmp/disk.img', '/tmp/disk.iso', 3, 4096, '8G',
+            'user1', 'pass1', 'User 1', False, False, False)
+>>>>>>> MERGE-SOURCE
         mock_create_disk_image.assert_called_once_with('/tmp/disk.img', '8G')
         mock_get_kernel.assert_called_once_with('/tmp/disk.iso')
         mock_extract_kernel.assert_called_once_with(
             '/tmp/disk.iso', '/tmp/kernel', '/tmp/12345')
         mock_prepare_initrd.assert_called_once_with(
-            '/tmp/12345', 'user1', 'pass1', 'User 1')
+            '/tmp/12345', 'user1', 'pass1', 'User 1', False)
         mock_wait.assert_called_once_with('/tmp/12345')
         launch_qemu_expected_calls = [
             call(['/tmp/qemu', '-m', '4096', '-smp', '3', '-pidfile',