Merge lp:~canonical-platform-qa/snappy-ecosystem-tests/allow-environment-variable-export into lp:snappy-ecosystem-tests

[Omer Akram]

Allow export of environment variables inside container.

Allow export of environment variables inside container.

[lp:~canonical-platform-qa/snappy-ecosystem-tests/allow-environment-variable-export]

31. By Omer Akram on 2017-03-03

simple

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

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

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

review: Approve (continuous-integration)

[Santiago Baldassin (sbaldassin)]

Looks good

review: Approve

=== modified file 'snappy_ecosystem_tests/environment/managers.py'
--- snappy_ecosystem_tests/environment/managers.py	2017-03-03 13:44:31 +0000
+++ snappy_ecosystem_tests/environment/managers.py	2017-03-03 15:53:20 +0000
@@ -34,6 +34,10 @@
 from snappy_ecosystem_tests.environment.data.snapd import (
     DEFAULT_CONTAINER_CONFIG, SNAPD_CONTAINER_NAME)
 
+COMMAND_ALLOW_ENV_VARS = 'sed -i \'/^AcceptEnv/ s/$/ {}/\' ' \
+                         '/etc/ssh/sshd_config'
+
+
 def get_manager(mode):
     """Get the manager for the given mode"""
     supported_modules = {
@@ -88,7 +92,6 @@
             container_name,
             DEPENDENCIES[container_type] + DEPENDENCIES['shared'])
 
-
     def configure(self, container_name, container_type, profile):
         """Configure a given container"""
         container = self.client.containers.get(container_name)
@@ -102,13 +105,20 @@
     @retry(stop_max_attempt_number=5, wait_fixed=3000,
            retry_on_exception=lambda exception: isinstance(
                exception, LXDAPIException))
-    def enable_ssh(self, container_name):
+    def enable_ssh(self, container_name, container_type, profile):
         """Enable the ssh connection on the container"""
         container = self.client.containers.get(container_name)
         pub_key = open(
             os.path.expanduser('~') + '/.ssh/id_rsa.pub').read().strip('\n')
         container.files.put('/home/ubuntu/.ssh/authorized_keys', pub_key)
-
+        # Allow export of environment variables over ssh.
+        container.execute(
+            COMMAND_ALLOW_ENV_VARS.format(
+                ' '.join(PROFILES[profile][container_type]
+                         ['environment_variables'].keys())
+            )
+        )
+        container.execute('service ssh restart')
 
     def setup(self, profile):
         """setup the container based on the profile"""
@@ -116,14 +126,13 @@
         self._setup(
             SNAPCRAFT_CONTAINER_NAME, constants.SNAPCRAFT, profile)
 
-
     def _setup(self, container_name, container_type, profile):
         """
         Launch a container, enable ssh, install dependencies
         and setup the needed environment variables
         """
         self.launch(container_name)
-        self.enable_ssh(container_name)
+        self.enable_ssh(container_name, container_type, profile)
         self.install(
             container_name,
             packages=[PROFILES[profile][container_type]["package_name"]],