Merge lp:~canonical-platform-qa/snappy-ecosystem-tests/spring-cleanup into lp:snappy-ecosystem-tests

[Omer Akram]

Remove unused lxd related code.

Remove unused lxd related code.

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

PASSED: Continuous integration, rev:38
https://platform-qa-jenkins.ubuntu.com/job/snappy-ecosystem-tests-ci/272/
Executed test runs:
    None: https://platform-qa-jenkins.ubuntu.com/job/generic-update-mp/2094/console

Click here to trigger a rebuild:
https://platform-qa-jenkins.ubuntu.com/job/snappy-ecosystem-tests-ci/272/rebuild

review: Approve (continuous-integration)

[lp:~canonical-platform-qa/snappy-ecosystem-tests/spring-cleanup]

39. By Omer Akram on 2017-03-09

More unused code removals

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

PASSED: Continuous integration, rev:39
https://platform-qa-jenkins.ubuntu.com/job/snappy-ecosystem-tests-ci/273/
Executed test runs:
    None: https://platform-qa-jenkins.ubuntu.com/job/generic-update-mp/2095/console

Click here to trigger a rebuild:
https://platform-qa-jenkins.ubuntu.com/job/snappy-ecosystem-tests-ci/273/rebuild

review: Approve (continuous-integration)

[Omer Akram (om26er)]

Note, I have removed the code that was trying to do set environment variables over ssh as those variables were not really doing anything. Snapd decides during runtime based on environment variable in /etc/environment if it should enable staging servers or not.

snapd only reads SNAPPY_USE_STAGING_STORE=1

[Santiago Baldassin (sbaldassin)]

Looks good

review: Approve

=== modified file 'snappy_ecosystem_tests/environment/data/snapd.py'
--- snappy_ecosystem_tests/environment/data/snapd.py	2017-03-06 17:09:46 +0000
+++ snappy_ecosystem_tests/environment/data/snapd.py	2017-03-09 17:27:27 +0000
@@ -20,71 +20,6 @@
 """snapd data"""
 SNAPD_CONTAINER_NAME = 'snapd'
 
-CONTAINER_HOME = '/root'
-DIRECTORY_CLONE = '{}/src/github.com/snapcore/snapd'.format(CONTAINER_HOME)
-DOMAIN_PING = 'ubuntu.com'
-ENV_STORE_API_ROOT = 'UBUNTU_STORE_API_ROOT_URL'
-ENV_STORE_SEARCH_ROOT = 'UBUNTU_STORE_SEARCH_ROOT_URL'
-ENV_STORE_UPLOAD_ROOT = 'UBUNTU_STORE_UPLOAD_ROOT_URL'
-ENV_SSO_API_ROOT = 'UBUNTU_SSO_API_ROOT_URL'
-PACKAGES_SNAPD = ['snapd', 'snap-confine', 'ubuntu-core-launcher']
-COMMAND_REMOVE_SNAPD = 'apt purge -y {}'.format(' '.join(PACKAGES_SNAPD))
-COMMAND_APT_BUILD_DEP = 'apt build-dep -y ./'
-COMMAND_APT_INSTALL = 'apt install -y {}'
-COMMAND_APT_INSTALL_STAGING_DEBS = COMMAND_APT_INSTALL.format(
-    ' '.join(['../{}*.deb'.format(pkg) for pkg in PACKAGES_SNAPD]))
-COMMAND_APT_UPDATE = 'apt update'
-COMMAND_APT_UPGRADE = 'apt dist-upgrade -y'
-COMMAND_BUILD_SNAPD = 'DEB_BUILD_OPTIONS="nocheck testkeys" ' \
-                      'dpkg-buildpackage -tc -b'
-COMMAND_EXPORT_STAGING_STORE_VAR = 'echo SNAPPY_USE_STAGING_STORE=1 >> ' \
-                                   '/etc/environment'
-COMMAND_GET_GOVENDOR = 'go get -v github.com/kardianos/govendor'
-COMMAND_GIT_CLONE = 'git clone {} {}'
-COMMAND_GOVENDOR_SYNC = 'govendor sync'
-REPOSITORY_GIT = 'https://github.com/snapcore/snapd'
-URL_API_ROOT = 'https://myapps.developer.staging.ubuntu.com/dev/api/'
-URL_SEARCH_ROOT = 'https://search.apps.staging.ubuntu.com/'
-URL_UPLOAD_ROOT = 'https://upload.apps.staging.ubuntu.com/'
-URL_SSO_API_ROOT = 'https://login.staging.ubuntu.com/api/v2/'
-
-CONTAINER_SETUP = [
-    COMMAND_REMOVE_SNAPD,
-    COMMAND_APT_UPDATE,
-    # Hold open-iscsi which is causing apt upgrade errors while running
-    # inside container.
-    'apt-mark hold open-iscsi',
-    COMMAND_APT_UPGRADE,
-    # Needed for snaps to work inside a lxd container
-    #  ref: https://stgraber.org/2016/12/07/running-snaps-in-lxd-containers/
-    COMMAND_APT_INSTALL.format('squashfuse'),
-    COMMAND_GIT_CLONE.format(REPOSITORY_GIT, DIRECTORY_CLONE),
-    {'command': COMMAND_APT_BUILD_DEP, 'cwd': DIRECTORY_CLONE},
-    {'command': COMMAND_GET_GOVENDOR, 'cwd': DIRECTORY_CLONE},
-    {'command': COMMAND_GOVENDOR_SYNC, 'cwd': DIRECTORY_CLONE},
-    {'command': COMMAND_BUILD_SNAPD, 'cwd': DIRECTORY_CLONE},
-    COMMAND_EXPORT_STAGING_STORE_VAR,
-    {'command': COMMAND_APT_INSTALL_STAGING_DEBS, 'cwd': DIRECTORY_CLONE}
-]
-
-SNAPCRAFT_STAGING_VARIABLES = {
-    ENV_STORE_API_ROOT: URL_API_ROOT,
-    ENV_STORE_SEARCH_ROOT: URL_SEARCH_ROOT,
-    ENV_STORE_UPLOAD_ROOT: URL_UPLOAD_ROOT,
-    ENV_SSO_API_ROOT: URL_SSO_API_ROOT,
-}
-
-SNAPD_STAGING_VARIABLES = {
-    'SNAPPY_USE_STAGING_STORE': '1'
-}
-
-STAGING_VARIABLES = dict(
-    SNAPCRAFT_STAGING_VARIABLES, **SNAPD_STAGING_VARIABLES)
-
-CONTAINER_ENV_VARS = {
-    'GOPATH': CONTAINER_HOME,
-}
-
 DEFAULT_CONTAINER_CONFIG = {
     "name": "snapd",
     "source": {

=== removed file 'snappy_ecosystem_tests/helpers/snapd/staging_builder.py'
--- snappy_ecosystem_tests/helpers/snapd/staging_builder.py	2017-03-02 10:51:37 +0000
+++ snappy_ecosystem_tests/helpers/snapd/staging_builder.py	1970-01-01 00:00:00 +0000
@@ -1,97 +0,0 @@
-# -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
-
-#
-# Snappy Ecosystem Tests
-# Copyright (C) 2017 Canonical
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-
-"""Module to enable staging environment for snapd."""
-
-import logging
-import sys
-from time import sleep
-
-from snappy_ecosystem_tests.environment.data.snapd import (
-    CONTAINER_HOME, CONTAINER_ENV_VARS, CONTAINER_SETUP)
-from snappy_ecosystem_tests.utils.lxd import Container, launch_container
-
-LOGGER = logging.getLogger(__name__)
-
-
-class StagingBuilder:
-    """Class to build and activate snapd staging environment."""
-    def __init__(self, container):
-        if not isinstance(container, Container):
-            raise RuntimeError(
-                '`container` must be an instance of '
-                'snappy_ecosystem_tests.utils.lxd.Container')
-        self.container = container
-
-    def _setup_staging(self):
-        """Export environment variables required to enable snapd/snapcraft
-        staging."""
-        LOGGER.info('Exporting staging environment variables')
-        updated_path = '{}/bin:{}'.format(
-            CONTAINER_HOME, self.container.execute('echo $PATH'))
-        CONTAINER_ENV_VARS['PATH'] = updated_path
-        for key, value in CONTAINER_ENV_VARS.items():
-            self.container.set_environment_variable(key, value, save=False)
-        self.container.save(wait=True)
-        LOGGER.info('Exported staging environment variables')
-
-    def _wait_for_internet(self, attempts_count=10, attempt_interval=1):
-        """Wait for internet connectivity in the container."""
-        for _ in range(attempts_count):
-            if self.container.is_internet_working():
-                break
-            else:
-                LOGGER.info('Sleeping for %s second(s)', attempt_interval)
-                sleep(attempt_interval)
-        else:
-            LOGGER.error(
-                'Failed to get internet access in container %s after %s '
-                'seconds', self.container.name,
-                attempts_count * attempt_interval)
-            sys.exit(1)
-
-    def _setup_and_build(self):
-        """Setup the container, pulls and builds snapd with staging enabled.
-        """
-        for command in CONTAINER_SETUP:
-            if isinstance(command, dict):
-                self.container.execute(**command)
-            else:
-                self.container.execute(command)
-
-    def build(self):
-        """Setup lxd container environment for snapd staging enabled builds."""
-        self._setup_staging()
-        self._wait_for_internet()
-        self._setup_and_build()
-
-
-if __name__ == '__main__':
-    # TODO remove local import
-    import argparse
-    logging.basicConfig(level=logging.INFO)
-    PARSER = argparse.ArgumentParser(
-        description='Builder for snapd staging environment.')
-    PARSER.add_argument('container_name', help='name for the new container.')
-    PARSER.add_argument(
-        'ubuntu_release', help='Ubuntu release version for the container.')
-    ARGS = PARSER.parse_args()
-    StagingBuilder(launch_container(name=ARGS.container_name,
-                                    release=ARGS.ubuntu_release)).build()

=== removed file 'snappy_ecosystem_tests/utils/lxd.py'
--- snappy_ecosystem_tests/utils/lxd.py	2017-02-21 13:46:08 +0000
+++ snappy_ecosystem_tests/utils/lxd.py	1970-01-01 00:00:00 +0000
@@ -1,125 +0,0 @@
-# -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
-
-#
-# Snappy Ecosystem Tests
-# Copyright (C) 2017 Canonical
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-
-"""Module to manipulate lxd containers."""
-
-import logging
-import shlex
-
-import pylxd
-from pylxd import models
-
-DEFAULT_CONTAINER_CONFIG = {
-    'name': 'snapd',
-    'source': {
-        'type': 'image',
-        'protocol': 'simplestreams',
-        'server': 'https://cloud-images.ubuntu.com/daily',
-        'alias': '16.04'
-    }
-}
-DOMAIN_PING = 'ubuntu.com'
-LOGGER = logging.getLogger(__name__)
-
-
-def launch_container(name, release, delete_existing=True):
-    """Launch a lxd container of the requested name and release and return
-    its object."""
-    lxd_client = pylxd.Client()
-    if delete_existing and lxd_client.containers.exists(name):
-        Container(lxd_client.containers.get(name)).delete()
-    container_config = DEFAULT_CONTAINER_CONFIG.copy()
-    container_config['source']['alias'] = release
-    container_config['name'] = name
-    container = Container(
-        lxd_client.containers.create(container_config, wait=True))
-    container.start(wait=True)
-    return container
-
-
-class Container:
-    """A Class representing a lxd container.
-
-    Extends and overrides some functionalities of pylxd.models.Container
-    instance through delegation since that class does not support inheritance.
-    """
-    def __init__(self, container_instance):
-        # TODO: move to inheritance once upstream supports it.
-        if not isinstance(container_instance, models.Container):
-            raise RuntimeError(
-                '`container_instance` must be an instance of '
-                'pylxd.models.Container'
-            )
-        #TODO: Remove this as the StageBuilder class already has an
-        # instance of the container
-        self._delegate = container_instance
-
-    def __getattr__(self, name):
-        """Set the container instance as delegate."""
-        return getattr(self._delegate, name)
-
-    @staticmethod
-    def _assemble_container_commands(command, cwd=''):
-        """Format and split the requested command to be container friendly."""
-        exec_command_base = 'sh -c \'{}\''
-        if cwd:
-            command = 'cd {}; {}'.format(cwd, command)
-        LOGGER.info('Run command: %s', command)
-        return shlex.split(exec_command_base.format(command))
-
-    #TODO move the following methods to another place which does not require
-    # a container class
-    def execute(self, command, environment=None, cwd=''):
-        """Execute command in the container."""
-        response = self._delegate.execute(
-            self._assemble_container_commands(command, cwd=cwd),
-            environment=environment or {}
-        )
-        if response.exit_code == 0:
-            LOGGER.info(response.stdout)
-            return response.stdout.strip()
-        raise ValueError(response.stderr)
-
-    def set_environment_variable(self, key, value, save=True):
-        """Exports environment variable to be available to
-        Container.execute()."""
-        self._delegate.config.update({'environment.{}'.format(key): value})
-        if save:
-            self._delegate.save(wait=True)
-
-    def is_running(self):
-        """Returns bool representing whether the container is running."""
-        return self._delegate.status == 'Running'
-
-    def delete(self, stop=True, wait=True):
-        """Stops and deletes the container."""
-        if stop and self.is_running():
-            self._delegate.stop(wait=True)
-        LOGGER.info('Deleting container %s', self.name)
-        self._delegate.delete(wait=wait)
-        LOGGER.info('Deleted container %s', self.name)
-
-    def is_internet_working(self, ping_domain=DOMAIN_PING):
-        """Return bool representing if the container have internet access."""
-        try:
-            self.execute('ping -c 1 {}'.format(ping_domain))
-            return True
-        except ValueError:
-            return False

=== modified file 'snappy_ecosystem_tests/utils/ssh.py'
--- snappy_ecosystem_tests/utils/ssh.py	2017-03-07 13:53:31 +0000
+++ snappy_ecosystem_tests/utils/ssh.py	2017-03-09 17:27:27 +0000
@@ -24,9 +24,6 @@
 
 import paramiko
 
-from snappy_ecosystem_tests.utils.storeconfig import get_current_store
-from snappy_ecosystem_tests.environment.data.snapd import STAGING_VARIABLES
-
 LOGGER = logging.getLogger(__name__)
 
 
@@ -36,14 +33,9 @@
     def exec_command(self, command, bufsize=-1, timeout=None, get_pty=False,
                      environment=None):
         """Execute the given command over ssh."""
-        if environment is None:
-            # FIXME: get environment variables dinamically
-            if get_current_store() == 'staging':
-                environment = STAGING_VARIABLES
         _, stdout, stderr = super().exec_command(
             command, bufsize, timeout,
-            get_pty,
-            environment=environment)
+            get_pty, environment=environment)
         if stdout.channel.recv_exit_status() != 0:
             raise ValueError(stderr.read().decode().strip())
         response = stdout.read().decode().strip()